shuo.wang
|
c2d673f3cb
|
Merge branch 'cc_20250224_fixBug' into cc_20250211_v2.6
# Conflicts:
# coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
|
2025-02-24 14:01:16 +08:00 |
|
shuo.wang
|
c97c5ab5c2
|
fix 选址专员全部显示
|
2025-02-24 13:57:19 +08:00 |
|
shuo.wang
|
555654e5c9
|
fix 小程序提交铺位区域和选址专员错误bug
|
2025-02-24 11:02:34 +08:00 |
|
shuo.wang
|
d703cbe9f6
|
fix 小程序提交铺位区域和选址专员错误bug
|
2025-02-24 09:43:56 +08:00 |
|
shuo.wang
|
f1e57ee772
|
fix null
|
2025-02-21 18:52:00 +08:00 |
|
shuo.wang
|
429559d394
|
fix
|
2025-02-21 17:21:05 +08:00 |
|
shuo.wang
|
eebefdbe79
|
fix
|
2025-02-21 15:55:43 +08:00 |
|
shuo.wang
|
ae8183423b
|
完善进度管理列的字段
|
2025-02-21 14:42:57 +08:00 |
|
shuo.wang
|
d10a04180b
|
fix 短信发送通知找不到人 null 的情况
|
2025-02-21 10:25:35 +08:00 |
|
shuo.wang
|
9777d8ecf5
|
add 铺位，选址相关的工作通知
|
2025-02-20 10:25:01 +08:00 |
|
shuo.wang
|
00ab8198eb
|
fix bug null
|
2025-02-19 18:11:46 +08:00 |
|
shuo.wang
|
35444f6cb9
|
add 运营方案审核不通过的工作通知
|
2025-02-19 16:22:34 +08:00 |
|
shuo.wang
|
88767d05a8
|
fix 短信通知找人出现null报错
|
2025-02-19 16:12:10 +08:00 |
|
苏竹红
|
72d1f5fb88
|
fix:登录调整
|
2025-02-19 16:04:37 +08:00 |
|
苏竹红
|
5e00fac82a
|
fix:登录调整
|
2025-02-19 16:02:35 +08:00 |
|
苏竹红
|
82fa96b5af
|
fix:登录调整
|
2025-02-19 15:58:05 +08:00 |
|
shuo.wang
|
c5131f43d3
|
fix 铺位提交审核没有审批人情况
|
2025-02-19 15:09:04 +08:00 |
|
shuo.wang
|
12b6cbb38d
|
Merge branch 'master' into cc_20250211_v2.6
|
2025-02-19 13:44:17 +08:00 |
|
苏竹红
|
87df6d4efa
|
Merge branch 'master' into cc_20250218_V2.5.1
|
2025-02-19 09:37:44 +08: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
|
d59b8feb3e
|
增加修改加盟商姓名接口
|
2025-02-18 15:11:59 +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
|
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
|
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 |
|
shuo.wang
|
f1e49fab7a
|
fix 门店状态已完成
|
2025-02-13 20:22:56 +08:00 |
|
shuo.wang
|
ac01c4009f
|
fix 门店状态已完成
|
2025-02-13 20:00:31 +08:00 |
|
shuo.wang
|
7377435498
|
fix 门店状态已完成
|
2025-02-13 19:47:20 +08: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
|
abfad1f11d
|
fix addBranchShop
|
2025-02-12 18:45:37 +08:00 |
|
shuo.wang
|
233d44e57b
|
测试企微通知
|
2025-02-11 19:07:15 +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
|
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 |
|