shuo.wang
|
0a5ca1e4f5
|
base
|
2025-07-10 11:23:22 +08:00 |
|
苏竹红
|
a578c22667
|
Merge branch 'cc20240703_prefried' into 'master'
Cc20240703 prefried
See merge request hangzhou/java/custom_zxjp!127
|
2025-07-08 10:05:31 +00:00 |
|
shuo.wang
|
428e42dddf
|
加盟模式加枚举
|
2025-07-08 11:08:25 +08:00 |
|
苏竹红
|
6e92279ecc
|
Merge branch 'cc_20250701_decoration' into 'master'
Cc 20250701 decoration
See merge request hangzhou/java/custom_zxjp!126
|
2025-07-07 09:42:48 +00:00 |
|
shuo.wang
|
df9651b2e9
|
fix 阶段备注
|
2025-07-07 10:10:00 +08:00 |
|
shuo.wang
|
ae79199bf1
|
fix 阶段备注
|
2025-07-07 09:43:52 +08:00 |
|
shuo.wang
|
41b6179ecf
|
预炸申请导出
|
2025-07-03 15:56:51 +08:00 |
|
苏竹红
|
eeb9bdc3ad
|
feat：销售完成
|
2025-06-26 14:47:08 +08:00 |
|
苏竹红
|
aacfe9aa2e
|
Merge branch 'cc_20250625_fix' into 'master'
删除门店加校验
See merge request hangzhou/java/custom_zxjp!119
|
2025-06-25 14:19:33 +00:00 |
|
shuo.wang
|
a5c66d1c57
|
删除门店加校验
|
2025-06-25 15:35:42 +08:00 |
|
苏竹红
|
88b6cefffb
|
feat：产品编码已存在
|
2025-06-24 17:24:21 +08:00 |
|
苏竹红
|
c8d2651841
|
feat：取消资格
|
2025-06-24 16:46:56 +08:00 |
|
苏竹红
|
3b3bcdca85
|
feat：预炸1
|
2025-06-24 16:37:43 +08:00 |
|
苏竹红
|
86baff52a1
|
feat：预炸
|
2025-06-24 11:34:56 +08:00 |
|
苏竹红
|
7eb5bf8059
|
feat：预炸
|
2025-06-24 11:34:43 +08:00 |
|
shuo.wang
|
7eee2969e8
|
小程序动态增加类型
|
2025-06-23 18:37:56 +08:00 |
|
苏竹红
|
2c8061f532
|
feat：预炸
|
2025-06-23 17:12:39 +08:00 |
|
苏竹红
|
9147a67b07
|
feat：预炸
|
2025-06-21 18:39:29 +08:00 |
|
shuo.wang
|
529e41a0af
|
修改设计师和设计组接口
|
2025-06-16 15:24:50 +08:00 |
|
shuo.wang
|
3fe7d80d8f
|
Merge branch 'master' into cc_20250605_shopReport
|
2025-06-10 15:42:39 +08:00 |
|
苏竹红
|
7d28b7f739
|
Merge branch 'cc_20250529_franchise_fee' into 'master'
Cc 20250529 franchise fee
See merge request hangzhou/java/custom_zxjp!109
|
2025-06-09 08:30:02 +00:00 |
|
shuo.wang
|
248d6c8367
|
优化数据处理接口
|
2025-06-09 13:26:28 +08:00 |
|
shuo.wang
|
7d88be8a1d
|
导出接口
|
2025-06-09 10:28:56 +08:00 |
|
苏竹红
|
1c8c5085d5
|
feat：门店数据
|
2025-06-06 10:55:27 +08:00 |
|
苏竹红
|
dd1bd487fc
|
feat：门店数据
|
2025-06-06 10:12:13 +08:00 |
|
shuo.wang
|
dadba55852
|
增加缴费金额校验
|
2025-06-05 15:48:23 +08:00 |
|
shuo.wang
|
0d389a9e89
|
门店明细表
|
2025-06-05 15:07:05 +08:00 |
|
苏竹红
|
747858b9cf
|
feat:回调
|
2025-06-04 14:29:20 +08:00 |
|
shuo.wang
|
a101a89c21
|
新管家状态枚举
|
2025-06-04 11:30:46 +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 |
|
苏竹红
|
073de9be88
|
feat:获取标品token
|
2025-05-29 18:32:01 +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
|
494dda498b
|
数据处理代码
|
2025-05-29 14:49:22 +08:00 |
|
shuo.wang
|
1e323efe7c
|
加盟费代码改造
|
2025-05-29 13:36:24 +08: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
|
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 |
|
苏竹红
|
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
|
7baf4804ec
|
京东外卖
|
2025-05-26 15:36:21 +08:00 |
|
shuo.wang
|
bafd6d31fc
|
京东外卖
|
2025-05-26 14:22:31 +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 |
|
苏竹红
|
9a5946ecf5
|
Merge branch 'cc_20250521_fix' into 'master'
Cc 20250521 fix
See merge request hangzhou/java/custom_zxjp!92
|
2025-05-21 09:47:06 +00:00 |
|
shuo.wang
|
4f068b70ac
|
缴纳加盟费检验缴费人必须是签约人
|
2025-05-21 16:38:44 +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
|
795f8efee7
|
移动端督导代写
|
2025-05-20 14:11:22 +08:00 |
|