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 |
|
苏竹红
|
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
|
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 |
|
shuo.wang
|
a3a2535239
|
fix 展示全部招商专员
|
2025-02-07 18:05:44 +08:00 |
|
shuo.wang
|
8b7b15aea1
|
fix 展示全部招商专员
|
2025-02-07 18:00:04 +08:00 |
|
shuo.wang
|
e919ed18ea
|
v2.5
|
2025-02-07 17:41:37 +08:00 |
|
shuo.wang
|
279ab0e0d4
|
开店管理导出加字段
|
2025-02-07 14:40:11 +08:00 |
|
shuo.wang
|
c87a934bde
|
开店管理导出加字段
|
2025-02-07 10:51:38 +08:00 |
|
shuo.wang
|
a109c20c34
|
fix pointRecommendLine 优化代码
|
2025-02-06 10:17:36 +08:00 |
|
苏竹红
|
78af1e29d5
|
fix:铺位推送bug
|
2025-02-06 10:02:38 +08:00 |
|
shuo.wang
|
172572106b
|
fix updateShopStatus
|
2025-01-23 15:45:27 +08:00 |
|
shuo.wang
|
a3b3a835e0
|
fix 计划开业时间
|
2025-01-23 14:43:30 +08:00 |
|
苏竹红
|
ca3303d898
|
feat:shopId
|
2025-01-22 15:53:56 +08:00 |
|
苏竹红
|
492f2999ee
|
feat:addBranchShop
|
2025-01-22 14:04:57 +08:00 |
|
shuo.wang
|
58d571f1a4
|
fix addBranchShop
|
2025-01-22 11:43:29 +08:00 |
|
shuo.wang
|
07cd613e32
|
fix getBranchShopList
|
2025-01-22 11:31:08 +08:00 |
|
shuo.wang
|
f849e6f82d
|
fix getBranchShopList
|
2025-01-22 10:39:15 +08:00 |
|
shuo.wang
|
1c6c2de8c0
|
fix initShop
|
2025-01-22 10:17:57 +08:00 |
|
shuo.wang
|
f4b3178c19
|
fix initShop
|
2025-01-22 09:51:29 +08:00 |
|
苏竹红
|
2580837cc4
|
feat:推送失败
|
2025-01-21 17:33:19 +08:00 |
|
shuo.wang
|
780a31323a
|
fix initShop
|
2025-01-21 16:20:08 +08:00 |
|
shuo.wang
|
17e6c7afa4
|
Merge remote-tracking branch 'origin/cc_20250106_v2.4' into cc_20250106_v2.4
|
2025-01-21 16:13:29 +08:00 |
|
shuo.wang
|
9764974aa9
|
fix initShop
|
2025-01-21 16:13:11 +08:00 |
|
苏竹红
|
9f9a1c890c
|
Merge remote-tracking branch 'origin/cc_20250106_v2.4' into cc_20250106_v2.4
|
2025-01-21 16:12:39 +08:00 |
|
苏竹红
|
532bf7d366
|
feat:筛选
|
2025-01-21 16:12:24 +08:00 |
|
shuo.wang
|
77a89376f3
|
fix getShopList 修改获取获取店铺列表逻辑
|
2025-01-21 15:08:25 +08:00 |
|
苏竹红
|
d62d970f0f
|
feat:shopClose
|
2025-01-20 14:53:50 +08:00 |
|
shuo.wang
|
5b25213e2c
|
fix getBranchShopList 分页
|
2025-01-20 10:21:33 +08:00 |
|
shuo.wang
|
789d3702ca
|
fix shopClose
|
2025-01-17 16:24:50 +08:00 |
|
苏竹红
|
984f94492a
|
Merge remote-tracking branch 'origin/cc_20250106_v2.4' into cc_20250106_v2.4
|
2025-01-17 11:29:59 +08:00 |
|