zhangchenbiao
|
b9daf94531
|
删除不用字段
|
2025-04-01 20:00:06 +08:00 |
|
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
|
4e3eda6659
|
PC+mini铺位改造
|
2025-03-31 15:37:22 +08:00 |
|
shuo.wang
|
ae381ea81a
|
记账本
|
2025-03-31 10:14:10 +08:00 |
|
shuo.wang
|
193f35bded
|
Merge branch 'master' into cc_20250324
|
2025-03-26 14:08:40 +08:00 |
|
shuo.wang
|
5bd795fec3
|
增加，门店恢复状态，删除门店接口
|
2025-03-24 15:12:50 +08:00 |
|
shuo.wang
|
79008aa661
|
加盟合同增加字段
|
2025-03-24 14:23:22 +08:00 |
|
shuo.wang
|
298b46d044
|
加盟合同增加字段+导出字段增加
|
2025-03-12 17:32:50 +08:00 |
|
shuo.wang
|
c00d2127d3
|
fix
|
2025-03-04 16:16:51 +08:00 |
|
shuo.wang
|
7e14212fe7
|
add 字段
|
2025-03-03 19:30:28 +08:00 |
|
shuo.wang
|
ae2855f02a
|
导出优化
|
2025-03-01 18:03:10 +08:00 |
|
shuo.wang
|
c0532dd18a
|
合同签约增加字段+优化导出列表
|
2025-02-27 14:44:52 +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
|
778a87403f
|
导出优化
|
2025-02-24 18:42:51 +08:00 |
|
shuo.wang
|
a064b1b08e
|
导出优化
|
2025-02-24 18:36:09 +08:00 |
|
shuo.wang
|
766bb5ccce
|
导出字段文案调整
|
2025-02-24 17:53:23 +08:00 |
|
shuo.wang
|
429559d394
|
fix
|
2025-02-21 17:21:05 +08:00 |
|
shuo.wang
|
ae8183423b
|
完善进度管理列的字段
|
2025-02-21 14:42:57 +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 |
|
苏竹红
|
87df6d4efa
|
Merge branch 'master' into cc_20250218_V2.5.1
|
2025-02-19 09:37:44 +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
|
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
|
1d088e41fb
|
fix 查询加盟费
|
2025-02-14 14:24:14 +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
|
8b485f1840
|
加盟费付款增加字段，发票回传增加字段
|
2025-02-11 15:33:07 +08:00 |
|
shuo.wang
|
294b547385
|
v2.5拆分第一年度管理费字段
|
2025-02-11 14:47:55 +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
|
279ab0e0d4
|
开店管理导出加字段
|
2025-02-07 14:40:11 +08:00 |
|
shuo.wang
|
c87a934bde
|
开店管理导出加字段
|
2025-02-07 10:51:38 +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
|
9764974aa9
|
fix initShop
|
2025-01-21 16:13:11 +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 |
|
苏竹红
|
2f18f00aa0
|
feat:新增加盟商名称
|
2025-01-17 11:29:33 +08:00 |
|
shuo.wang
|
420d88ba28
|
updateBranchShopDetail / 增加字段
|
2025-01-17 10:44:53 +08:00 |
|
shuo.wang
|
a5586fc90b
|
fix getBranchShopDetail 增加pointId
|
2025-01-16 15:15:12 +08:00 |
|
shuo.wang
|
4542242c42
|
fix 开店列表改造支持查询我管辖我负责的
|
2025-01-15 18:16:58 +08:00 |
|
shuo.wang
|
c266ec0253
|
fix 开店详情增加字段
|
2025-01-15 15:12:51 +08:00 |
|
shuo.wang
|
fb07cdabcd
|
fix 开店详情
|
2025-01-15 13:42:56 +08:00 |
|
shuo.wang
|
d1bcd2c558
|
fix 开店详情
|
2025-01-15 11:35:29 +08:00 |
|
shuo.wang
|
d1975cb87e
|
fix 开店详情增加字段
|
2025-01-15 11:04:33 +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 |
|