苏竹红
|
22107ffac0
|
feat：预炸
|
2025-06-24 13:41:42 +08:00 |
|
苏竹红
|
86baff52a1
|
feat：预炸
|
2025-06-24 11:34:56 +08:00 |
|
苏竹红
|
7eb5bf8059
|
feat：预炸
|
2025-06-24 11:34:43 +08:00 |
|
苏竹红
|
1dab792aad
|
feat：预炸
|
2025-06-23 21:41:41 +08:00 |
|
苏竹红
|
09e4226077
|
feat：预炸
|
2025-06-23 20:25:32 +08:00 |
|
苏竹红
|
2c8061f532
|
feat：预炸
|
2025-06-23 17:12:39 +08:00 |
|
shuo.wang
|
9d73c7ae9b
|
待办接口
|
2025-06-23 16:48:59 +08:00 |
|
shuo.wang
|
2fb004de85
|
根据申请ID获取审批记录列表 增加创建时间字段
|
2025-06-23 15:33:57 +08:00 |
|
shuo.wang
|
8df08b7236
|
Merge remote-tracking branch 'origin/cc_20250620_pre_fly' into cc_20250620_pre_fly
|
2025-06-23 15:22:51 +08:00 |
|
shuo.wang
|
908ae9dc58
|
根据申请ID获取审批记录列表 增加创建时间字段
|
2025-06-23 15:22:18 +08:00 |
|
shuo.wang
|
3b50e63615
|
根据申请ID获取审批记录列表 增加操作类型字段
|
2025-06-23 15:21:12 +08:00 |
|
shuo.wang
|
8a143ea816
|
desk 部分接口改造
|
2025-06-23 14:25:47 +08:00 |
|
苏竹红
|
466ef0beb3
|
feat：预炸
|
2025-06-23 11:35:26 +08:00 |
|
苏竹红
|
1ca98f41ce
|
feat：预炸
|
2025-06-23 10:41:33 +08:00 |
|
苏竹红
|
9147a67b07
|
feat：预炸
|
2025-06-21 18:39:29 +08:00 |
|
shuo.wang
|
637078730d
|
fix加盟合同
|
2025-06-16 10:05:40 +08:00 |
|
shuo.wang
|
c8a50f3350
|
fix加盟合同
|
2025-06-13 16:17:44 +08:00 |
|
苏竹红
|
31e09c0e3f
|
Merge branch 'cc_20250609_takeoutBuild' into 'master'
Cc 20250609 takeout build
See merge request hangzhou/java/custom_zxjp!113
|
2025-06-11 10:29:48 +00:00 |
|
shuo.wang
|
541eac1799
|
fix
|
2025-06-11 11:01:23 +08:00 |
|
shuo.wang
|
690b4b15f1
|
fix
|
2025-06-10 16:03:48 +08:00 |
|
shuo.wang
|
b2b694fd46
|
Merge branch 'master' into cc_20250609_takeoutBuild
# Conflicts:
# coolstore-partner-service/src/main/java/com/cool/store/service/impl/BuildInformationServiceImpl.java
|
2025-06-10 15:44:00 +08:00 |
|
shuo.wang
|
3fe7d80d8f
|
Merge branch 'master' into cc_20250605_shopReport
|
2025-06-10 15:42:39 +08:00 |
|
shuo.wang
|
e4fe4368fd
|
修改结算人信息接口
|
2025-06-10 14:02:58 +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 |
|
苏竹红
|
3233e773f2
|
feat:推送门店
|
2025-06-05 15:09:14 +08:00 |
|
shuo.wang
|
0d389a9e89
|
门店明细表
|
2025-06-05 15:07:05 +08:00 |
|
苏竹红
|
8dad6016ec
|
feat:加盟费
|
2025-06-05 11:30:28 +08:00 |
|
shuo.wang
|
88865224cc
|
fix
|
2025-06-04 18:40:08 +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
|
51a3da146c
|
fix
|
2025-06-04 09:40:00 +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
|
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
|
0f1b40f21f
|
fix
|
2025-05-28 20:00:06 +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 |
|