shuo.wang
|
3fe7d80d8f
|
Merge branch 'master' into cc_20250605_shopReport
|
2025-06-10 15:42:39 +08:00 |
|
苏竹红
|
7d28b7f739
|
Merge branch 'cc_20250529_franchise_fee' into 'master'
Cc 20250529 franchise fee
See merge request hangzhou/java/custom_zxjp!109
|
2025-06-09 08:30:02 +00:00 |
|
shuo.wang
|
248d6c8367
|
优化数据处理接口
|
2025-06-09 13:26:28 +08:00 |
|
shuo.wang
|
7d88be8a1d
|
导出接口
|
2025-06-09 10:28:56 +08:00 |
|
苏竹红
|
1c8c5085d5
|
feat：门店数据
|
2025-06-06 10:55:27 +08:00 |
|
苏竹红
|
dd1bd487fc
|
feat：门店数据
|
2025-06-06 10:12:13 +08:00 |
|
shuo.wang
|
dadba55852
|
增加缴费金额校验
|
2025-06-05 15:48:23 +08:00 |
|
shuo.wang
|
0d389a9e89
|
门店明细表
|
2025-06-05 15:07:05 +08:00 |
|
苏竹红
|
747858b9cf
|
feat:回调
|
2025-06-04 14:29:20 +08:00 |
|
shuo.wang
|
a101a89c21
|
新管家状态枚举
|
2025-06-04 11:30:46 +08:00 |
|
苏竹红
|
08afc93c94
|
feat:订单编号生成 订单编号
|
2025-06-03 15:08:25 +08:00 |
|
shuo.wang
|
c014841e8c
|
加盟费改造
|
2025-05-30 18:17:57 +08:00 |
|
shuo.wang
|
20fcd02ac2
|
Merge branch 'refs/heads/master' into cc_20250529_franchise_fee
|
2025-05-30 15:14:56 +08:00 |
|
苏竹红
|
43f9475549
|
Merge branch 'master' into cc_20250529_login
# Conflicts:
# coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
|
2025-05-30 13:40:53 +08:00 |
|
苏竹红
|
073de9be88
|
feat:获取标品token
|
2025-05-29 18:32:01 +08:00 |
|
shuo.wang
|
4f9ac6c56d
|
加盟商结束跟进
|
2025-05-29 17:52:40 +08:00 |
|
shuo.wang
|
a9f8fd9306
|
加盟商结束跟进
|
2025-05-29 17:27:52 +08:00 |
|
shuo.wang
|
494dda498b
|
数据处理代码
|
2025-05-29 14:49:22 +08:00 |
|
shuo.wang
|
1e323efe7c
|
加盟费代码改造
|
2025-05-29 13:36:24 +08:00 |
|
shuo.wang
|
d13a535e82
|
fix
|
2025-05-27 16:42:58 +08:00 |
|
shuo.wang
|
01bdd19c1d
|
fix
|
2025-05-27 16:39:24 +08:00 |
|
shuo.wang
|
68be3ba4d1
|
Merge branch 'master' into cc_20250526_jingDong
# Conflicts:
# coolstore-partner-common/src/main/java/com/cool/store/enums/UserRoleEnum.java
# coolstore-partner-service/src/main/java/com/cool/store/service/DeskService.java
# coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
# coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DeskController.java
|
2025-05-27 13:51:36 +08:00 |
|
苏竹红
|
575e927d68
|
Merge branch 'cc_20250520_ghostwriting' into 'master'
Cc 20250520 ghostwriting
See merge request hangzhou/java/custom_zxjp!97
|
2025-05-27 05:48:29 +00:00 |
|
shuo.wang
|
e2a1076b44
|
设置ai模块展示
|
2025-05-27 10:05:43 +08:00 |
|
shuo.wang
|
7baf4804ec
|
京东外卖
|
2025-05-26 15:36:21 +08:00 |
|
shuo.wang
|
bafd6d31fc
|
京东外卖
|
2025-05-26 14:22:31 +08:00 |
|
shuo.wang
|
824a59c22b
|
Merge branch 'master' into cc_20250520_ghostwriting
# Conflicts:
# coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
|
2025-05-21 19:35:15 +08:00 |
|
苏竹红
|
9a5946ecf5
|
Merge branch 'cc_20250521_fix' into 'master'
Cc 20250521 fix
See merge request hangzhou/java/custom_zxjp!92
|
2025-05-21 09:47:06 +00:00 |
|
shuo.wang
|
4f068b70ac
|
缴纳加盟费检验缴费人必须是签约人
|
2025-05-21 16:38:44 +08:00 |
|
苏竹红
|
bcd2531139
|
Merge branch 'cc_2250513_api' into 'master'
Cc 2250513 api
See merge request hangzhou/java/custom_zxjp!89
|
2025-05-20 09:32:04 +00:00 |
|
shuo.wang
|
795f8efee7
|
移动端督导代写
|
2025-05-20 14:11:22 +08:00 |
|
苏竹红
|
36f2b04b17
|
Merge branch 'cc_20250516_dataHandler' into 'master'
Cc 20250516 data handler
See merge request hangzhou/java/custom_zxjp!88
|
2025-05-19 10:33:21 +00:00 |
|
苏竹红
|
8c8fd75d73
|
feat:建店品牌负责人通知
|
2025-05-19 14:26:31 +08:00 |
|
shuo.wang
|
058a9bc250
|
fix
|
2025-05-19 13:55:53 +08:00 |
|
苏竹红
|
a8993e9b60
|
Merge branch 'cc_20250513_franchise_report' into 'master'
Cc 20250513 franchise report
See merge request hangzhou/java/custom_zxjp!82
|
2025-05-15 10:14:23 +00:00 |
|
苏竹红
|
cf5af4cb77
|
feat:自有店财务
|
2025-05-15 17:05:00 +08:00 |
|
shuo.wang
|
369f93b1a2
|
Merge branch 'master' into cc_20250513_franchise_report
|
2025-05-15 16:30:12 +08:00 |
|
shuo.wang
|
f253b2a0c3
|
统计报表接口，数据梳理接口
|
2025-05-15 15:31:23 +08:00 |
|
苏竹红
|
9e324de66f
|
feat:阶段数据
|
2025-05-15 10:55:01 +08:00 |
|
shuo.wang
|
177ff32f58
|
报表列表接口
|
2025-05-14 17:33:32 +08:00 |
|
苏竹红
|
4d7efab991
|
feat:阶段数据
|
2025-05-14 15:13:22 +08:00 |
|
shuo.wang
|
3137d9d7f4
|
Merge branch 'master' into cc_20250513_franchise_report
|
2025-05-14 13:35:51 +08:00 |
|
shuo.wang
|
e1706f7cc9
|
Merge remote-tracking branch 'origin/cc_2250513_api' into cc_2250513_api
|
2025-05-14 10:03:24 +08:00 |
|
shuo.wang
|
3ca4478c91
|
Merge branch 'cc_20250513_franchise_report' into cc_2250513_api
|
2025-05-14 10:03:04 +08:00 |
|
苏竹红
|
c9b6ccdee4
|
feat:正新菜品token
|
2025-05-13 18:41:55 +08:00 |
|
shuo.wang
|
a9a7f027db
|
Merge branch 'cc_20250513' into cc_2250513_api
|
2025-05-13 18:04:49 +08:00 |
|
shuo.wang
|
7233f12a16
|
fix
|
2025-05-13 18:04:24 +08:00 |
|
shuo.wang
|
36ebeae707
|
Merge branch 'cc_20250513' into cc_2250513_api
|
2025-05-13 17:01:05 +08:00 |
|
shuo.wang
|
176e403813
|
加盟报表代码
|
2025-05-13 17:00:13 +08:00 |
|
shuo.wang
|
2bf1ddea47
|
提交建店资料加锁防止重复提交
|
2025-05-13 15:02:55 +08:00 |
|