shuo.wang
|
f5ec896b59
|
Merge remote-tracking branch 'origin/cc_20250211_v2.6' into cc_20250211_v2.6
|
2025-02-26 16:45:55 +08:00 |
|
苏竹红
|
857c62a333
|
Merge remote-tracking branch 'origin/cc_20250211_v2.6' into cc_20250211_v2.6
|
2025-02-26 16:43:24 +08:00 |
|
苏竹红
|
e452412613
|
fix:登录调整
|
2025-02-26 16:43:10 +08:00 |
|
shuo.wang
|
490b06946c
|
Merge branch 'master' into cc_20250211_v2.6
# Conflicts:
# coolstore-partner-model/src/main/java/com/cool/store/dto/FranchiseFeeDTO.java
# coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java
|
2025-02-26 16:33:58 +08:00 |
|
shuo.wang
|
74fa4a0fd1
|
fix
|
2025-02-25 15:31:42 +08:00 |
|
shuo.wang
|
778a87403f
|
导出优化
|
2025-02-24 18:42:51 +08:00 |
|
shuo.wang
|
a064b1b08e
|
导出优化
|
2025-02-24 18:36:09 +08:00 |
|
shuo.wang
|
10ca7a1845
|
fix
|
2025-02-21 16:28:19 +08:00 |
|
shuo.wang
|
be7fee6b53
|
fix
|
2025-02-21 16:03:17 +08:00 |
|
shuo.wang
|
ae8183423b
|
完善进度管理列的字段
|
2025-02-21 14:42:57 +08:00 |
|
苏竹红
|
44861fed66
|
fix:登录调整
|
2025-02-19 16:26:22 +08:00 |
|
苏竹红
|
82fa96b5af
|
fix:登录调整
|
2025-02-19 15:58:05 +08:00 |
|
shuo.wang
|
12b6cbb38d
|
Merge branch 'master' into cc_20250211_v2.6
|
2025-02-19 13:44:17 +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
|
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
|
82d90774ab
|
add 企微通知
|
2025-02-17 11:11:29 +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
|
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 |
|
shuo.wang
|
e76e09b18b
|
fix 门店状态已完成
|
2025-02-13 20:16:05 +08:00 |
|
shuo.wang
|
7377435498
|
fix 门店状态已完成
|
2025-02-13 19:47:20 +08:00 |
|
shuo.wang
|
8b485f1840
|
加盟费付款增加字段，发票回传增加字段
|
2025-02-11 15:33:07 +08:00 |
|
shuo.wang
|
294b547385
|
v2.5拆分第一年度管理费字段
|
2025-02-11 14:47:55 +08:00 |
|
shuo.wang
|
5485835abf
|
优化：开店管理导出
|
2025-02-10 15:08:25 +08:00 |
|
shuo.wang
|
8b7b15aea1
|
fix 展示全部招商专员
|
2025-02-07 18:00:04 +08:00 |
|
shuo.wang
|
279ab0e0d4
|
开店管理导出加字段
|
2025-02-07 14:40:11 +08:00 |
|
shuo.wang
|
c87a934bde
|
开店管理导出加字段
|
2025-02-07 10:51:38 +08:00 |
|
苏竹红
|
78af1e29d5
|
fix:铺位推送bug
|
2025-02-06 10:02:38 +08:00 |
|
shuo.wang
|
a3b3a835e0
|
fix 计划开业时间
|
2025-01-23 14:43:30 +08:00 |
|
shuo.wang
|
07cd613e32
|
fix getBranchShopList
|
2025-01-22 11:31:08 +08:00 |
|
shuo.wang
|
1c6c2de8c0
|
fix initShop
|
2025-01-22 10:17:57 +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 |
|
苏竹红
|
2f18f00aa0
|
feat:新增加盟商名称
|
2025-01-17 11:29:33 +08:00 |
|
苏竹红
|
f4e69b016e
|
Merge remote-tracking branch 'origin/cc_20250106_v2.4' into cc_20250106_v2.4
|
2025-01-16 16:57:07 +08:00 |
|
苏竹红
|
90b4360a66
|
feat:校验
|
2025-01-16 16:56:06 +08:00 |
|
shuo.wang
|
bdeeeda862
|
fix batchUpdateByShopIdsAndSubStageStatus
|
2025-01-15 18:50:11 +08:00 |
|
shuo.wang
|
8c09ed83ae
|
Merge remote-tracking branch 'origin/cc_20250106_v2.4' into cc_20250106_v2.4
|
2025-01-15 18:17:31 +08:00 |
|
shuo.wang
|
4542242c42
|
fix 开店列表改造支持查询我管辖我负责的
|
2025-01-15 18:16:58 +08:00 |
|
苏竹红
|
ac9fe3a5e0
|
Merge remote-tracking branch 'origin/cc_20250106_v2.4' into cc_20250106_v2.4
|
2025-01-15 17:55:04 +08:00 |
|
苏竹红
|
1c2e7a0781
|
feat:V2.4
|
2025-01-15 17:54:47 +08:00 |
|
shuo.wang
|
ca46954d70
|
fix 意向加盟阶段完成对门店阶段的处理
|
2025-01-15 17:40:22 +08:00 |
|
shuo.wang
|
e39607382c
|
fix 意向加盟阶段完成对门店阶段的处理
|
2025-01-15 17:14:07 +08:00 |
|
shuo.wang
|
73a3ab769d
|
fix 开店管理查询条件
|
2025-01-14 19:03:29 +08:00 |
|
shuo.wang
|
a98828529a
|
fix 开店管理根据意向区域查询
|
2025-01-14 18:48:40 +08:00 |
|
苏竹红
|
fc622ef0ab
|
feat:V2.4
|
2025-01-14 11:31:40 +08:00 |
|
shuo.wang
|
06e37e0e89
|
fix
|
2025-01-13 14:53:18 +08:00 |
|