shuo.wang
|
f6fc1c133a
|
Merge branch 'master' into cc_20250327_tallyBook
# Conflicts:
# coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
|
2025-04-01 18:50:27 +08:00 |
|
shuo.wang
|
20f3f36347
|
fix
|
2025-04-01 17:08:40 +08:00 |
|
shuo.wang
|
4b59c1659e
|
fix
|
2025-04-01 15:38:13 +08:00 |
|
shuo.wang
|
00a57cc6e6
|
获取状态为完成的门店列表接口+记账本定时任务
|
2025-03-31 17:36:10 +08:00 |
|
shuo.wang
|
cc34f3b5f6
|
fix
|
2025-03-31 16:19:17 +08:00 |
|
shuo.wang
|
4e3eda6659
|
PC+mini铺位改造
|
2025-03-31 15:37:22 +08:00 |
|
shuo.wang
|
ae381ea81a
|
记账本
|
2025-03-31 10:14:10 +08:00 |
|
shuo.wang
|
1d82a08d37
|
fix
|
2025-03-24 16:08:21 +08:00 |
|
shuo.wang
|
3ffcede71a
|
增加，门店恢复状态，删除门店接口
|
2025-03-24 15:28:31 +08:00 |
|
shuo.wang
|
879db971ea
|
增加，门店恢复状态，删除门店接口
|
2025-03-24 15:01:45 +08:00 |
|
shuo.wang
|
c7ae833e0b
|
加盟合同增加字段+导出字段增加
|
2025-03-12 17:40:15 +08:00 |
|
shuo.wang
|
298b46d044
|
加盟合同增加字段+导出字段增加
|
2025-03-12 17:32:50 +08:00 |
|
shuo.wang
|
1f81bc47fd
|
fix partnerList
|
2025-03-05 13:47:39 +08:00 |
|
shuo.wang
|
e718a31564
|
fix
|
2025-03-03 20:10:46 +08:00 |
|
shuo.wang
|
26e05b3e7c
|
fix
|
2025-03-03 20:01:01 +08:00 |
|
shuo.wang
|
ae2855f02a
|
导出优化
|
2025-03-01 18:03:10 +08:00 |
|
shuo.wang
|
ceb385dee7
|
fix
|
2025-03-01 17:45:14 +08:00 |
|
shuo.wang
|
dea88558c5
|
fix
|
2025-03-01 17:41:22 +08:00 |
|
shuo.wang
|
ca884abbd2
|
fix
|
2025-03-01 17:38:38 +08:00 |
|
shuo.wang
|
f793b09c89
|
fix
|
2025-03-01 17:34:16 +08:00 |
|
shuo.wang
|
ef12033705
|
fix
|
2025-03-01 17:16:53 +08:00 |
|
shuo.wang
|
c0532dd18a
|
合同签约增加字段+优化导出列表
|
2025-02-27 14:44:52 +08:00 |
|
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 |
|