shuo.wang
|
47a0eadff1
|
Merge branch 'master' into cc_20250623_desk
|
2025-06-26 14:30:46 +08:00 |
|
shuo.wang
|
deaec48f66
|
fix 没有门店看不到加盟商
|
2025-06-26 14:11:26 +08:00 |
|
shuo.wang
|
c232175aa5
|
待办优化需求
|
2025-06-26 13:51:24 +08:00 |
|
苏竹红
|
1e8129aabc
|
feat：排序
|
2025-06-25 22:52:27 +08:00 |
|
苏竹红
|
c7bdb954a7
|
feat：排序
|
2025-06-25 22:48:20 +08:00 |
|
苏竹红
|
06fb503411
|
feat：eid
|
2025-06-25 22:39:56 +08:00 |
|
苏竹红
|
395fe38362
|
feat：fry_date
|
2025-06-25 18:07:41 +08:00 |
|
苏竹红
|
965f78269e
|
feat：fry_date
|
2025-06-25 16:04:57 +08:00 |
|
苏竹红
|
e919de59fb
|
feat：applyType
|
2025-06-24 20:58:01 +08:00 |
|
苏竹红
|
e17900dcd5
|
feat：applyType
|
2025-06-24 20:51:43 +08:00 |
|
苏竹红
|
a9bbd743e8
|
Merge remote-tracking branch 'origin/cc_20250620_pre_fly' into cc_20250620_pre_fly
|
2025-06-24 20:46:05 +08:00 |
|
苏竹红
|
cba79701a6
|
feat：applyType
|
2025-06-24 20:45:48 +08:00 |
|
shuo.wang
|
97597e72be
|
fix
|
2025-06-24 20:15:28 +08:00 |
|
shuo.wang
|
5af71339b8
|
增加筛选条件 ：预炸资质申请管理列表
|
2025-06-24 18:21:07 +08:00 |
|
shuo.wang
|
5c851b3d8e
|
fix
|
2025-06-24 17:36:13 +08:00 |
|
苏竹红
|
88b6cefffb
|
feat：产品编码已存在
|
2025-06-24 17:24:21 +08:00 |
|
苏竹红
|
d4a2123434
|
feat：预炸1
|
2025-06-24 16:19:02 +08:00 |
|
苏竹红
|
9b1aafb60b
|
feat：预炸1
|
2025-06-24 16:11:51 +08:00 |
|
苏竹红
|
8963e87cc3
|
feat：预炸1
|
2025-06-24 15:25:32 +08:00 |
|
苏竹红
|
4c7d8d7ec3
|
feat：预炸1
|
2025-06-24 15:09:11 +08:00 |
|
苏竹红
|
ca8c8183f2
|
feat：预炸
|
2025-06-24 14:53:17 +08:00 |
|
苏竹红
|
7eb5bf8059
|
feat：预炸
|
2025-06-24 11:34:43 +08:00 |
|
苏竹红
|
1dab792aad
|
feat：预炸
|
2025-06-23 21:41:41 +08:00 |
|
shuo.wang
|
52d9ef8214
|
小程序动态增加类型
|
2025-06-23 20:40:07 +08:00 |
|
苏竹红
|
2a2d047c08
|
feat：预炸
|
2025-06-23 20:29:46 +08:00 |
|
苏竹红
|
09e4226077
|
feat：预炸
|
2025-06-23 20:25:32 +08:00 |
|
shuo.wang
|
7eee2969e8
|
小程序动态增加类型
|
2025-06-23 18:37:56 +08:00 |
|
苏竹红
|
2c8061f532
|
feat：预炸
|
2025-06-23 17:12:39 +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
|
529e41a0af
|
修改设计师和设计组接口
|
2025-06-16 15:24:50 +08:00 |
|
苏竹红
|
dea98ee193
|
feat：线上bug紧急修复
|
2025-06-13 15:46:34 +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
|
ffd502c6f0
|
fix
|
2025-06-11 10:16:46 +08:00 |
|
shuo.wang
|
c2142f7d51
|
筛选store表有效的门店
|
2025-06-11 10:04:33 +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 |
|
苏竹红
|
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
|
171f3ca08b
|
建店资料同步平台建店
|
2025-06-09 15:39:05 +08:00 |
|
shuo.wang
|
aa789e1e93
|
fix
|
2025-06-09 14:30:02 +08:00 |
|
shuo.wang
|
248d6c8367
|
优化数据处理接口
|
2025-06-09 13:26:28 +08:00 |
|
shuo.wang
|
d71dfb05c5
|
//审批拒绝阶段 数据处理
|
2025-06-06 11:34:09 +08:00 |
|
shuo.wang
|
0d389a9e89
|
门店明细表
|
2025-06-05 15:07:05 +08:00 |
|
苏竹红
|
81083972ca
|
feat:xxl
|
2025-06-04 17:40:43 +08:00 |
|
shuo.wang
|
86611d2178
|
数据处理代码
|
2025-06-04 16:58:16 +08:00 |
|
shuo.wang
|
2788afba17
|
处理冲突
|
2025-06-04 14:35:28 +08:00 |
|
shuo.wang
|
e14806db30
|
数据处理
|
2025-06-04 14:30:04 +08:00 |
|