Commit Graph

1213 Commits

Author SHA1 Message Date
shuo.wang
3d003afc9c 增加字段 所属管理区域 2025-07-11 13:20:50 +08:00
shuo.wang
d257c19496 创建门店 2025-07-11 10:39:59 +08:00
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
55b840be27 加盟模式加枚举 2025-07-08 13:24:10 +08:00
shuo.wang
f598892aa5 加盟模式加枚举 2025-07-08 11:24:47 +08:00
shuo.wang
6c7449d915 增加@Async 2025-07-08 10:01:27 +08:00
shuo.wang
32ac5d82a9 增加@ExcelIgnore 2025-07-08 09:52:12 +08:00
shuo.wang
6a3f890f44 去掉加字段 2025-07-08 09:31:47 +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
41b6179ecf 预炸申请导出 2025-07-03 15:56:51 +08:00
shuo.wang
8da905350f 预炸品加字段 2025-07-03 15:06:37 +08:00
shuo.wang
55abe7db99 成功开店代码改造 2025-07-03 11:33:26 +08:00
shuo.wang
8a4dd5693e 成功开店代码改造 2025-07-03 10:58:37 +08:00
shuo.wang
cb69bef277 成功开店代码改造 2025-07-02 17:53:46 +08:00
shuo.wang
c71b52bbfb 装修验收代码 2025-07-01 18:44:54 +08:00
shuo.wang
d667cf7d54 fix 2025-06-26 15:41:48 +08:00
shuo.wang
47a0eadff1 Merge branch 'master' into cc_20250623_desk 2025-06-26 14:30:46 +08:00
shuo.wang
c232175aa5 待办优化需求 2025-06-26 13:51:24 +08:00
苏竹红
55ac947ed9 feat:产品ID不能为空 2025-06-25 20:26:14 +08:00
shuo.wang
40a3988a40 fix 2025-06-25 14:01:39 +08:00
shuo.wang
5af71339b8 增加筛选条件 :预炸资质申请管理列表 2025-06-24 18:21:07 +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
苏竹红
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