Commit Graph

2537 Commits

Author SHA1 Message Date
shuo.wang
735e595631 fix 2025-06-04 10:24:41 +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
苏竹红
057f7c68e4 feat:获取标品token 2025-05-29 18:45:56 +08:00
苏竹红
073de9be88 feat:获取标品token 2025-05-29 18:32:01 +08:00
shuo.wang
0b2e903e28 加盟商结束跟进 2025-05-29 18:19:13 +08:00
shuo.wang
a9f8fd9306 加盟商结束跟进 2025-05-29 17:27:52 +08:00
shuo.wang
8a529743e8 选址名称不同步门店 2025-05-29 15:50:13 +08:00
shuo.wang
a6cf42840d 数据处理代码 2025-05-29 15:05:12 +08:00
shuo.wang
494dda498b 数据处理代码 2025-05-29 14:49:22 +08:00
shuo.wang
b67654b6a9 待办加字段 2025-05-29 13:52:33 +08:00
shuo.wang
1e323efe7c 加盟费代码改造 2025-05-29 13:36:24 +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
shuo.wang
0f1b40f21f fix 2025-05-28 20:00:06 +08:00
shuo.wang
f8e4f985f7 推送数据新管家店名优化 2025-05-28 18:28:12 +08:00
shuo.wang
e1c8be97c9 xxljb 2025-05-28 17:13:31 +08:00
shuo.wang
521041447e 数据处理 2025-05-28 15:32:23 +08:00
shuo.wang
a5ad26928c 数据处理代码 2025-05-28 10:09:40 +08:00
苏竹红
7b3b7a8aef Merge branch 'cc_20250526_jingDong' into 'master'
fix

See merge request hangzhou/java/custom_zxjp!103
2025-05-27 10:14:07 +00:00
shuo.wang
e94fbbf6d8 fix 2025-05-27 18:11:38 +08:00
shuo.wang
0f410ad251 业务备注 2025-05-27 16:28:37 +08:00
shuo.wang
88af6191fb 业务备注 2025-05-27 16:17:20 +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
苏竹红
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
e2a1076b44 设置ai模块展示 2025-05-27 10:05:43 +08:00
shuo.wang
3a17363c7c fix 2025-05-26 20:50:53 +08:00
shuo.wang
3ae63c892a 合同审核加锁 2025-05-26 17:39:54 +08:00
shuo.wang
98ab7f1a1b 京东外卖 2025-05-26 17:10:01 +08:00
shuo.wang
d7028e5e7e 京东外卖 2025-05-26 16:40:27 +08:00
shuo.wang
6c19332b1e 京东外卖desk 2025-05-26 16:01:50 +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
0d64beab84 抖音核销手机号 2025-05-26 13:41:05 +08:00
shuo.wang
ad7c879a78 批量处理云流水订货阶段接口 2025-05-23 16:33:52 +08:00
shuo.wang
acb8c25cab 放开缴纳加盟费检验缴费人必须是加盟商校验 2025-05-23 14:22:08 +08:00
苏竹红
060ace82d6 Merge branch 'cc_20250520_point' into 'master'
Cc 20250520 point

See merge request hangzhou/java/custom_zxjp!94
2025-05-23 03:28:27 +00:00
shuo.wang
0501edfbef fix 2025-05-23 10:29:03 +08:00
shuo.wang
dea59e63bf fix根据职位找人 2025-05-22 19:02:20 +08:00
shuo.wang
a6f9e23e20 fix 2025-05-22 17:50:23 +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