Commit Graph

3899 Commits

Author SHA1 Message Date
shuo.wang
5af71339b8 增加筛选条件 :预炸资质申请管理列表 2025-06-24 18:21:07 +08:00
苏竹红
84574c905a feat:applyType 2025-06-24 18:08:34 +08:00
苏竹红
86e6c0a306 Merge remote-tracking branch 'origin/cc_20250620_pre_fly' into cc_20250620_pre_fly 2025-06-24 18:07:12 +08:00
苏竹红
2ae54ccc20 feat:applyType 2025-06-24 18:06:51 +08:00
shuo.wang
1cc20804fb fix 2025-06-24 17:46:54 +08:00
shuo.wang
5c851b3d8e fix 2025-06-24 17:36:13 +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
苏竹红
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
苏竹红
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
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
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
苏竹红
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
苏竹红
2571ed2956 feat:oss配置 2025-06-17 14:56:51 +08:00
苏竹红
596c3e9ea1 Merge branch 'cc_20250613_fix' into 'master'
Cc 20250613 fix

See merge request hangzhou/java/custom_zxjp!115
2025-06-16 10:41:24 +00:00
shuo.wang
fbc7fde73f fix 2025-06-16 18:31:27 +08:00
shuo.wang
6ca067693a fix 2025-06-16 17:26:27 +08:00
shuo.wang
f09a932e87 fix 2025-06-16 16:52:36 +08:00
shuo.wang
529e41a0af 修改设计师和设计组接口 2025-06-16 15:24:50 +08:00
shuo.wang
87ae0108fa 新管家生成店名规则 2025-06-16 14:42:08 +08:00
shuo.wang
637078730d fix加盟合同 2025-06-16 10:05:40 +08:00
shuo.wang
8f484d39fc Merge branch 'master' into cc_20250613_fix 2025-06-13 18:04:36 +08:00
shuo.wang
1dd7394258 Merge branch 'cc_20250612_payInfo' into cc_20250613_fix 2025-06-13 18:03:44 +08:00
shuo.wang
c8a50f3350 fix加盟合同 2025-06-13 16:17:44 +08:00
苏竹红
dea98ee193 feat:线上bug紧急修复 2025-06-13 15:46:34 +08:00
苏竹红
bc95e976ce Merge branch 'cc_20250612_desk' into 'master'
加盟费待办增加职位阶段展示对账中

See merge request hangzhou/java/custom_zxjp!114
2025-06-12 09:22:23 +00:00
shuo.wang
53ed63596e mini加接口 2025-06-12 16:09:10 +08:00
shuo.wang
72d6167104 加盟费待办增加职位阶段展示对账中 2025-06-12 10:48:33 +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
苏竹红
cb3a23aaf9 Merge branch 'cc_20250611_fix' into 'master'
Cc 20250611 fix

See merge request hangzhou/java/custom_zxjp!112
2025-06-11 09:38:08 +00:00
shuo.wang
c8337c4f2c fix 2025-06-11 17:22:55 +08:00
苏竹红
3d518399f7 Merge branch 'cc_20250529_franchise_fee' into 'master'
feat:fix bug修复

See merge request hangzhou/java/custom_zxjp!111
2025-06-11 07:11:50 +00:00
苏竹红
538b08040c feat:fix bug修复 2025-06-11 15:04:11 +08:00