Commit Graph

3872 Commits

Author SHA1 Message Date
shuo.wang
b67654b6a9 待办加字段 2025-05-29 13:52:33 +08:00
shuo.wang
1e323efe7c 加盟费代码改造 2025-05-29 13:36:24 +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
shuo.wang
9245d04fe0 京东外卖 2025-05-26 16:34:28 +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
bafd6d31fc 京东外卖 2025-05-26 14:22:31 +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
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
苏竹红
7b30396dae Merge branch 'cc_20250523_fix_check' into 'master'
放开缴纳加盟费检验缴费人必须是加盟商校验

See merge request hangzhou/java/custom_zxjp!95
2025-05-23 06:23:46 +00: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
e3cb699236 fix 2025-05-22 22:24:58 +08:00