苏竹红
|
87df6d4efa
|
Merge branch 'master' into cc_20250218_V2.5.1
|
2025-02-19 09:37:44 +08:00 |
|
苏竹红
|
bce96ebc5d
|
Merge branch 'cc20250207_optimize_v2.5' into 'master'
Cc20250207 optimize v2.5
See merge request hangzhou/java/custom_zxjp!45
|
2025-02-18 11:04:57 +00:00 |
|
shuo.wang
|
a5dc0898ce
|
fix
|
2025-02-18 18:04:07 +08:00 |
|
shuo.wang
|
9822bfc75c
|
fix
|
2025-02-18 17:59:45 +08:00 |
|
shuo.wang
|
528ff2660f
|
fix
|
2025-02-18 16:23:58 +08:00 |
|
shuo.wang
|
1c863e40f2
|
fix
|
2025-02-18 16:20:15 +08:00 |
|
shuo.wang
|
d59b8feb3e
|
增加修改加盟商姓名接口
|
2025-02-18 15:11:59 +08:00 |
|
shuo.wang
|
d1a1df62e9
|
fix getShopList
|
2025-02-18 14:05:07 +08:00 |
|
shuo.wang
|
a4b45e2ec2
|
fix getShopList
|
2025-02-18 13:59:16 +08:00 |
|
shuo.wang
|
3588919fcc
|
Merge branch 'cc20250207_optimize_v2.5' into cc_20250211_v2.6
|
2025-02-17 15:32:16 +08:00 |
|
shuo.wang
|
50a7700fdf
|
add 企微通知
|
2025-02-17 15:31:25 +08:00 |
|
shuo.wang
|
82d90774ab
|
add 企微通知
|
2025-02-17 11:11:29 +08:00 |
|
shuo.wang
|
f78fddf06f
|
add 企微通知
|
2025-02-17 11:04:42 +08:00 |
|
shuo.wang
|
5e7351fbfa
|
add 企微通知
|
2025-02-14 16:19:57 +08:00 |
|
shuo.wang
|
71db4d6e6e
|
Merge branch 'master' into cc_20250211_v2.6
# Conflicts:
# coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
|
2025-02-14 16:18:00 +08:00 |
|
shuo.wang
|
212a1b6c1c
|
add 企微通知
|
2025-02-14 16:16:05 +08:00 |
|
shuo.wang
|
1d088e41fb
|
fix 查询加盟费
|
2025-02-14 14:24:14 +08:00 |
|
shuo.wang
|
1dd385513c
|
fix 门店状态已完成
|
2025-02-13 20:57:01 +08:00 |
|
shuo.wang
|
9f61a428c1
|
Merge branch 'master' into cc20250207_optimize_v2.5
# Conflicts:
# coolstore-partner-dao/src/main/java/com/cool/store/mapper/FranchiseFeeMapper.java
|
2025-02-13 20:56:27 +08:00 |
|
苏竹红
|
0a8951dab4
|
Merge branch 'cc_20250106_v2.4' into 'master'
fix 门店状态已完成
See merge request hangzhou/java/custom_zxjp!43
|
2025-02-13 12:23:52 +00:00 |
|
shuo.wang
|
f1e49fab7a
|
fix 门店状态已完成
|
2025-02-13 20:22:56 +08:00 |
|
shuo.wang
|
e76e09b18b
|
fix 门店状态已完成
|
2025-02-13 20:16:05 +08:00 |
|
苏竹红
|
b121088683
|
Merge branch 'cc_20250106_v2.4' into 'master'
fix 门店状态已完成
See merge request hangzhou/java/custom_zxjp!42
|
2025-02-13 12:02:35 +00:00 |
|
shuo.wang
|
ac01c4009f
|
fix 门店状态已完成
|
2025-02-13 20:00:31 +08:00 |
|
苏竹红
|
e3e955da07
|
Merge branch 'cc_20250106_v2.4' into 'master'
fix 门店状态已完成
See merge request hangzhou/java/custom_zxjp!41
|
2025-02-13 11:50:28 +00:00 |
|
shuo.wang
|
7377435498
|
fix 门店状态已完成
|
2025-02-13 19:47:20 +08:00 |
|
苏竹红
|
d2b919ef28
|
Merge branch 'cc_20250106_v2.4' into 'master'
Cc 20250106 v2.4
See merge request hangzhou/java/custom_zxjp!40
|
2025-02-13 10:44:20 +00:00 |
|
shuo.wang
|
7501e0e5f3
|
fix 开店管理导出
|
2025-02-13 18:40:41 +08:00 |
|
shuo.wang
|
e782a9044f
|
fix 开店管理导出
|
2025-02-13 18:29:24 +08:00 |
|
shuo.wang
|
105e6febb9
|
fix 企微跳转链接
|
2025-02-13 17:23:04 +08:00 |
|
shuo.wang
|
bfd3f908e2
|
fix 企微跳转链接
|
2025-02-13 17:19:06 +08:00 |
|
shuo.wang
|
38e6b19fe2
|
fix 企微跳转链接
|
2025-02-13 17:10:01 +08:00 |
|
苏竹红
|
8f7d4e4963
|
Merge branch 'cc_20250106_v2.4' into 'master'
Cc 20250106 v2.4
See merge request hangzhou/java/custom_zxjp!39
|
2025-02-13 09:04:01 +00:00 |
|
shuo.wang
|
abfad1f11d
|
fix addBranchShop
|
2025-02-12 18:45:37 +08:00 |
|
shuo.wang
|
233d44e57b
|
测试企微通知
|
2025-02-11 19:07:15 +08:00 |
|
shuo.wang
|
8aa877efa5
|
测试企微通知
|
2025-02-11 18:41:19 +08:00 |
|
shuo.wang
|
1aa08b1b2d
|
测试企微通知
|
2025-02-11 18:09:20 +08:00 |
|
shuo.wang
|
880d074546
|
测试企微通知
|
2025-02-11 16:44:02 +08:00 |
|
shuo.wang
|
ca23967be2
|
测试企微通知
|
2025-02-11 16:31:50 +08:00 |
|
shuo.wang
|
8b485f1840
|
加盟费付款增加字段，发票回传增加字段
|
2025-02-11 15:33:07 +08:00 |
|
shuo.wang
|
8208524632
|
Merge remote-tracking branch 'origin/cc20250207_optimize_v2.5' into cc20250207_optimize_v2.5
|
2025-02-11 14:48:13 +08:00 |
|
shuo.wang
|
294b547385
|
v2.5拆分第一年度管理费字段
|
2025-02-11 14:47:55 +08:00 |
|
shuo.wang
|
ba1d1758f6
|
fix getTeamPartnerList
|
2025-02-10 17:24:19 +08:00 |
|
shuo.wang
|
07bd9630a7
|
fix payFranchiseFeesPendingList
|
2025-02-10 17:16:19 +08:00 |
|
shuo.wang
|
d1409def5b
|
fix payFranchiseFeesPendingList
|
2025-02-10 17:07:14 +08:00 |
|
shuo.wang
|
4215b40e72
|
fix 新建分店名称
|
2025-02-10 16:45:47 +08:00 |
|
shuo.wang
|
4a56a29b4c
|
优化：开店管理导出
|
2025-02-10 15:49:09 +08:00 |
|
shuo.wang
|
5485835abf
|
优化：开店管理导出
|
2025-02-10 15:08:25 +08:00 |
|
shuo.wang
|
f3af0c7704
|
工作台待办缴纳加盟费分配给分部内勤
|
2025-02-10 14:01:29 +08:00 |
|
shuo.wang
|
f16678104b
|
fix 展示全部招商专员
|
2025-02-07 18:08:21 +08:00 |
|