shuo.wang
|
c8504734f3
|
Merge branch 'master' into cc_20250527_desk
# Conflicts:
# coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
|
2025-05-27 13:59:30 +08:00 |
|
苏竹红
|
4cf91113f3
|
Merge branch 'cc_20250523' into 'master'
批量处理云流水订货阶段接口
See merge request hangzhou/java/custom_zxjp!101
|
2025-05-27 05:56:27 +00:00 |
|
shuo.wang
|
9a58b1f2a7
|
Merge branch 'master' into cc_20250523
# Conflicts:
# coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCShopController.java
|
2025-05-27 13:56:09 +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 |
|
shuo.wang
|
e281730b84
|
工作台搜索
|
2025-05-27 13:49:30 +08:00 |
|
苏竹红
|
865cfdc857
|
Merge branch 'cc_20250526_douyin' into 'master'
Cc 20250526 douyin
See merge request hangzhou/java/custom_zxjp!99
|
2025-05-27 05:48:35 +00: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
|
6c19332b1e
|
京东外卖desk
|
2025-05-26 16:01:50 +08:00 |
|
shuo.wang
|
0d64beab84
|
抖音核销手机号
|
2025-05-26 13:41:05 +08:00 |
|
shuo.wang
|
b3cb8178ff
|
抖音核销手机号
|
2025-05-26 10:58:36 +08:00 |
|
shuo.wang
|
7f49647443
|
feat: 优化装修/外卖团购账号开通
|
2025-05-26 10:14:54 +08:00 |
|
shuo.wang
|
ad7c879a78
|
批量处理云流水订货阶段接口
|
2025-05-23 16:33:52 +08:00 |
|
shuo.wang
|
e3cb699236
|
fix
|
2025-05-22 22:24:58 +08:00 |
|
shuo.wang
|
99d1126d82
|
fix
|
2025-05-22 17:34:01 +08:00 |
|
shuo.wang
|
e2c8795bde
|
add 字段
|
2025-05-22 15:26:16 +08:00 |
|
shuo.wang
|
50ed46f702
|
铺位改造
|
2025-05-22 14:28:44 +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 |
|
shuo.wang
|
f7bd14fdb5
|
Merge branch 'master' into cc_20250520_point
|
2025-05-21 19:32:33 +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
|
14b9292738
|
待办接口加更新时间
|
2025-05-21 16:22:31 +08:00 |
|
shuo.wang
|
1bae29ff4c
|
待办接口加更新时间
|
2025-05-21 16:15:27 +08:00 |
|
shuo.wang
|
55ba214e96
|
获取成功开店接口改造
|
2025-05-21 14:26:23 +08:00 |
|
shuo.wang
|
b41ecc436a
|
待办排序+更新时间
|
2025-05-21 11:23:43 +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
|
17a5137ec8
|
add铺位优化
|
2025-05-20 14:21:04 +08:00 |
|
shuo.wang
|
795f8efee7
|
移动端督导代写
|
2025-05-20 14:11:22 +08:00 |
|
苏竹红
|
267bc65421
|
Merge branch 'cc_20250515_handle' into 'master'
Cc 20250515 handle
See merge request hangzhou/java/custom_zxjp!87
|
2025-05-19 10:30:37 +00:00 |
|
苏竹红
|
cfefb0fe34
|
Merge branch 'cc_20250513_franchise_report' into 'master'
报表导出
See merge request hangzhou/java/custom_zxjp!86
|
2025-05-16 10:22:36 +00:00 |
|
shuo.wang
|
3de0a3aef6
|
报表导出
|
2025-05-16 18:18:50 +08:00 |
|
苏竹红
|
1a55f80890
|
Merge branch 'cc_20250513_franchise_report' into 'master'
Cc 20250513 franchise report
See merge request hangzhou/java/custom_zxjp!84
|
2025-05-16 09:16:00 +00:00 |
|
shuo.wang
|
988c0bc7cd
|
推数数据云流水账号加前缀
|
2025-05-16 16:23:33 +08:00 |
|
苏竹红
|
683167687c
|
Merge branch 'master' into cc_20250515_handle
|
2025-05-16 15:19:20 +08:00 |
|
shuo.wang
|
81263112d5
|
统计报表接口，数据梳理接口
|
2025-05-16 13:18:59 +08:00 |
|
苏竹红
|
d857501b36
|
Merge branch 'cc_20250513_franchise_report' into 'master'
fix
See merge request hangzhou/java/custom_zxjp!83
|
2025-05-15 12:04:48 +00:00 |
|
shuo.wang
|
3c2f97d2f6
|
fix
|
2025-05-15 19:00:55 +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 |
|
苏竹红
|
0acb2dbea1
|
feat:意向阶段数据
|
2025-05-15 16:47:00 +08:00 |
|
shuo.wang
|
f253b2a0c3
|
统计报表接口，数据梳理接口
|
2025-05-15 15:31:23 +08:00 |
|
苏竹红
|
14035dee4b
|
feat:自有店逻辑修改
|
2025-05-15 14:01:44 +08:00 |
|
shuo.wang
|
177ff32f58
|
报表列表接口
|
2025-05-14 17:33:32 +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 |
|
shuo.wang
|
11de076ba2
|
合代码
|
2025-05-14 10:02:43 +08:00 |
|
苏竹红
|
c9b6ccdee4
|
feat:正新菜品token
|
2025-05-13 18:41:55 +08:00 |
|
shuo.wang
|
f63c0fd940
|
Merge branch 'cc_20250513' into cc_2250513_api
|
2025-05-13 18:03:14 +08:00 |
|
shuo.wang
|
550be8c205
|
fix
|
2025-05-13 18:02:46 +08:00 |
|
shuo.wang
|
91a5e8034d
|
fix
|
2025-05-13 18:01:52 +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 |
|