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 |
|
shuo.wang
|
79bd4d68eb
|
fix
|
2025-01-14 11:33:00 +08:00 |
|
shuo.wang
|
e15dbdd99f
|
fix
|
2025-01-13 16:38:41 +08:00 |
|
shuo.wang
|
06e37e0e89
|
fix
|
2025-01-13 14:53:18 +08:00 |
|
苏竹红
|
5d2afdf9c5
|
feat:V2.4
|
2025-01-10 19:02:16 +08:00 |
|
苏竹红
|
81b135bba6
|
Merge branch 'master' into cc_20250106_v2.4
# Conflicts:
# coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml
|
2025-01-10 18:35:32 +08:00 |
|
shuo.wang
|
c738cfebf7
|
fix
|
2025-01-10 18:03:54 +08:00 |
|
shuo.wang
|
0ee5a24a76
|
修改增加意向门店接口
|
2025-01-10 18:00:32 +08:00 |
|
shuo.wang
|
2f962e4039
|
修改增加意向门店接口
|
2025-01-10 17:22:27 +08:00 |
|
shuo.wang
|
c4199ee27c
|
加盟商详情，门店列表
|
2025-01-10 14:22:42 +08:00 |
|
shuo.wang
|
2d94266e62
|
开店列表+导出
|
2025-01-09 17:18:21 +08:00 |
|
shuo.wang
|
4acd471fbd
|
门店转让记录,修改门店招商专员/督导接口
|
2025-01-08 17:32:54 +08:00 |
|
shuo.wang
|
96f8ad4a7e
|
新建分店接口
|
2025-01-08 16:08:56 +08:00 |
|
shuo.wang
|
3579bb5f7c
|
查找加盟商接口，改造跟进日志接口
|
2025-01-08 14:19:07 +08:00 |
|
苏竹红
|
fae4d72e3b
|
feat:V2.3.1
|
2025-01-07 14:40:56 +08:00 |
|
苏竹红
|
5ee1e852e8
|
feat:保留两位
|
2025-01-02 17:27:37 +08:00 |
|
苏竹红
|
274fc7ccf9
|
feat:发票回传
|
2025-01-02 10:26:25 +08:00 |
|
苏竹红
|
5d58481259
|
Merge branch 'cc_20241219_license' into 'master'
Cc 20241219 license
See merge request hangzhou/java/custom_zxjp!36
|
2024-12-24 10:03:13 +00:00 |
|
shuo.wang
|
0fd5c6d1d8
|
fix 开业营运方案筹备人为null
|
2024-12-20 18:39:52 +08:00 |
|
shuo.wang
|
5361cfc1d4
|
fix 开业营运方案筹备人为null
|
2024-12-20 18:38:23 +08:00 |
|
shuo.wang
|
4ff40b2f7f
|
fix 开业营运方案筹备人为null
|
2024-12-20 18:14:18 +08:00 |
|
shuo.wang
|
9d81c34ad4
|
fix 开业营运方案筹备人为null
|
2024-12-20 18:07:58 +08:00 |
|
shuo.wang
|
9e75be5034
|
fix 开业营运方案筹备人为null
|
2024-12-20 17:56:12 +08:00 |
|