Commit Graph

847 Commits

Author SHA1 Message Date
shuo.wang
c014841e8c 加盟费改造 2025-05-30 18:17:57 +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
2273366423 数据处理代码 2025-05-29 15:05:58 +08:00
shuo.wang
494dda498b 数据处理代码 2025-05-29 14:49:22 +08:00
shuo.wang
6d50469af2 Merge branch 'master' into cc_20250527_desk
# Conflicts:
#	coolstore-partner-web/src/main/resources/application-online.properties
2025-05-28 20:07:48 +08:00
苏竹红
34be028e62 Merge branch 'cc_20250528_dataHandler' into 'master'
Cc 20250528 data handler

See merge request hangzhou/java/custom_zxjp!104
2025-05-28 12:06:52 +00:00
shuo.wang
e1c8be97c9 xxljb 2025-05-28 17:13:31 +08:00
杨杰
a6f56758ee Update application-online.properties 2025-05-28 07:50:31 +00:00
shuo.wang
521041447e 数据处理 2025-05-28 15:32:23 +08:00
shuo.wang
9025ee6446 业务备注 2025-05-27 15:22:52 +08:00
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
苏竹红
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
9245d04fe0 京东外卖 2025-05-26 16:34:28 +08:00
shuo.wang
625766a703 京东外卖desk 2025-05-26 15:41:29 +08:00
shuo.wang
7baf4804ec 京东外卖 2025-05-26 15:36:21 +08:00
shuo.wang
7565e74fec PC银行信息接口 2025-05-23 21:31:40 +08:00
shuo.wang
ad7c879a78 批量处理云流水订货阶段接口 2025-05-23 16:33:52 +08:00
shuo.wang
c5e2477f55 add pc 获取店铺所属品牌 2025-05-23 14:44:13 +08:00
shuo.wang
dea59e63bf fix根据职位找人 2025-05-22 19:02:20 +08:00
shuo.wang
ed1b79beb2 pc ocr识别 2025-05-22 16:07:47 +08:00
shuo.wang
6310372d2a pc ocr识别 2025-05-22 16:03:22 +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
苏竹红
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
198a0319c8 pc 缴纳加盟费,提交建店资料 2025-05-20 14:36:37 +08: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
shuo.wang
0744a9abb2 Merge branch 'master' into cc_20250516_dataHandler 2025-05-19 18:32:23 +08:00
shuo.wang
0909369e59 fix 2025-05-19 18:31:27 +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
shuo.wang
058a9bc250 fix 2025-05-19 13:55:53 +08:00
苏竹红
18cc2ca621 feat:处理人 2025-05-16 18:05:59 +08:00
苏竹红
a69354a5cd feat:处理人数据 2025-05-16 16:37:36 +08:00
shuo.wang
9ad46e8943 统计报表接口,数据梳理接口 2025-05-16 10:28:55 +08:00
shuo.wang
83f2dcb7c0 统计报表接口,数据梳理接口 2025-05-16 10:19:46 +08:00
shuo.wang
1f949ac459 统计报表接口,数据梳理接口 2025-05-16 10:08:16 +08:00
shuo.wang
45feec8a1b 统计报表接口,数据梳理接口 2025-05-15 18:09:08 +08:00
shuo.wang
bd3fa05bf2 统计报表接口,数据梳理接口 2025-05-15 17:58:06 +08:00
shuo.wang
f253b2a0c3 统计报表接口,数据梳理接口 2025-05-15 15:31:23 +08:00
shuo.wang
177ff32f58 报表列表接口 2025-05-14 17:33:32 +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
176e403813 加盟报表代码 2025-05-13 17:00:13 +08:00
苏竹红
c3a18e7354 feat:askbot 门店获取方式变更 2025-05-13 15:07:29 +08:00