shuo.wang
|
050fe3f9d5
|
账单修改接口加阶段校验
|
2025-06-05 09:35:08 +08:00 |
|
shuo.wang
|
9712bf6fb3
|
fix
|
2025-06-04 19:38:58 +08:00 |
|
shuo.wang
|
88865224cc
|
fix
|
2025-06-04 18:40:08 +08:00 |
|
shuo.wang
|
bd47f46015
|
fix
|
2025-06-04 17:49:30 +08:00 |
|
shuo.wang
|
022b91b9fb
|
fix
|
2025-06-04 17:43:23 +08:00 |
|
苏竹红
|
81083972ca
|
feat:xxl
|
2025-06-04 17:40:43 +08:00 |
|
shuo.wang
|
2c50b237f8
|
增加接口获取店铺某阶段状态
|
2025-06-04 17:18:31 +08:00 |
|
shuo.wang
|
d3bc5baa0a
|
Merge remote-tracking branch 'origin/cc_20250529_franchise_fee' into cc_20250529_franchise_fee
|
2025-06-04 16:58:43 +08:00 |
|
shuo.wang
|
86611d2178
|
数据处理代码
|
2025-06-04 16:58:16 +08:00 |
|
苏竹红
|
61ebca6b92
|
feat:阶段完成
|
2025-06-04 15:14:21 +08:00 |
|
shuo.wang
|
2788afba17
|
处理冲突
|
2025-06-04 14:35:28 +08:00 |
|
shuo.wang
|
e14806db30
|
数据处理
|
2025-06-04 14:30:04 +08:00 |
|
苏竹红
|
747858b9cf
|
feat:回调
|
2025-06-04 14:29:20 +08:00 |
|
shuo.wang
|
eaf416ad5e
|
接口移出
|
2025-06-04 11:30:15 +08:00 |
|
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 |
|