Commit Graph

3788 Commits

Author SHA1 Message Date
苏竹红
dd1bd487fc feat:门店数据 2025-06-06 10:12:13 +08:00
苏竹红
81083972ca feat:xxl 2025-06-04 17:40:43 +08:00
苏竹红
143df4138a feat:xxl 2025-06-04 16:50:26 +08:00
苏竹红
abc6dd137d Merge branch 'cc_20250529_login' into 'master'
Cc 20250529 login

See merge request hangzhou/java/custom_zxjp!107
2025-05-30 05:41:15 +00: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
苏竹红
6dfce8b0e2 feat:登录 2025-05-30 13:39:26 +08:00
苏竹红
2bab35ab1a Merge branch 'cc_20250529_fix_desk' into 'master'
Cc 20250529 fix desk

See merge request hangzhou/java/custom_zxjp!106
2025-05-29 10:49:50 +00: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
3abd8b99ef 加盟商结束跟进 2025-05-29 18:29:33 +08:00
shuo.wang
0b2e903e28 加盟商结束跟进 2025-05-29 18:19:13 +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
8a529743e8 选址名称不同步门店 2025-05-29 15:50:13 +08:00
shuo.wang
2273366423 数据处理代码 2025-05-29 15:05:58 +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
苏竹红
861ea11bf1 Merge branch 'cc_20250527_desk' into 'master'
Cc 20250527 desk

See merge request hangzhou/java/custom_zxjp!105
2025-05-28 12:08:10 +00: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
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
杨杰
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
011d60a4d7 fix 2025-05-28 10:26:19 +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
苏竹红
8d21108bc1 Merge branch 'cc_20250526_jingDong' into 'master'
Cc 20250526 jing dong

See merge request hangzhou/java/custom_zxjp!102
2025-05-27 09:05:03 +00: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
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
苏竹红
6115ecd603 Merge branch 'cc_20250526_jingDong' into 'master'
Cc 20250526 jing dong

See merge request hangzhou/java/custom_zxjp!100
2025-05-27 05:53:08 +00: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
苏竹红
29eca3edb4 Merge branch 'cc_20250527_hide_ai' into 'master'
设置ai模块展示

See merge request hangzhou/java/custom_zxjp!96
2025-05-27 03:33:08 +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