Commit Graph

3839 Commits

Author SHA1 Message Date
苏竹红
1bcaf34f19 Merge branch 'cc_20250605_shopReport' into 'master'
Cc 20250605 shop report

See merge request hangzhou/java/custom_zxjp!110
2025-06-10 09:30:02 +00:00
shuo.wang
eaf2db93ff fix 2025-06-10 16:41:51 +08:00
shuo.wang
a4643291f6 fix加盟费缴费信息时间问题 2025-06-10 16:01: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
苏竹红
df1ed1cf63 Merge branch 'cc_20250606_store_extend' into 'master'
Cc 20250606 store extend

See merge request hangzhou/java/custom_zxjp!108
2025-06-09 08:28:59 +00:00
shuo.wang
f9c79eaf0c fix导出 2025-06-09 16:19:11 +08:00
shuo.wang
aa789e1e93 fix 2025-06-09 14:30:02 +08:00
shuo.wang
b195adca33 Merge remote-tracking branch 'origin/cc_20250529_franchise_fee' into cc_20250529_franchise_fee 2025-06-09 13:49:55 +08:00
苏竹红
09d6fcc6d8 feat:franchiseFeeDataHandler 2025-06-09 13:37:47 +08:00
shuo.wang
248d6c8367 优化数据处理接口 2025-06-09 13:26:28 +08:00
shuo.wang
7d88be8a1d 导出接口 2025-06-09 10:28:56 +08:00
苏竹红
06fc2affdc feat:门店数据 2025-06-06 18:29:42 +08:00
shuo.wang
ba796a1d08 fix 2025-06-06 17:57:34 +08:00
shuo.wang
1eb42edb88 fix 2025-06-06 13:52:03 +08:00
shuo.wang
d71dfb05c5 //审批拒绝阶段 数据处理 2025-06-06 11:34:09 +08:00
shuo.wang
d6051898c0 fix 2025-06-06 10:59:29 +08:00
苏竹红
1c8c5085d5 feat:门店数据 2025-06-06 10:55:27 +08:00
shuo.wang
b90c325c1a fix 缴费金额限制 2025-06-06 10:51:58 +08:00
苏竹红
dd1bd487fc feat:门店数据 2025-06-06 10:12:13 +08:00
shuo.wang
431929338a 优化仓储找副总裁问题 2025-06-06 09:39:42 +08:00
shuo.wang
f19507e153 add 接口 2025-06-05 17:22:02 +08:00
苏竹红
b68a4ec386 feat:创建时间 2025-06-05 17:08:31 +08:00
苏竹红
423b2b921a feat:环境切换 2025-06-05 16:56:22 +08:00
shuo.wang
dd07bca48d fix 2025-06-05 15:57:10 +08:00
苏竹红
2b0035a9aa Merge remote-tracking branch 'origin/cc_20250529_franchise_fee' into cc_20250529_franchise_fee 2025-06-05 15:50:43 +08:00
苏竹红
197e833f90 feat:环境切换 2025-06-05 15:50:24 +08:00
shuo.wang
dadba55852 增加缴费金额校验 2025-06-05 15:48:23 +08:00
苏竹红
3233e773f2 feat:推送门店 2025-06-05 15:09:14 +08:00
shuo.wang
0d389a9e89 门店明细表 2025-06-05 15:07:05 +08:00
苏竹红
83843b67bc Merge remote-tracking branch 'origin/cc_20250529_franchise_fee' into cc_20250529_franchise_fee 2025-06-05 11:30:44 +08:00
苏竹红
8dad6016ec feat:加盟费 2025-06-05 11:30:28 +08:00
shuo.wang
050fe3f9d5 账单修改接口加阶段校验 2025-06-05 09:35:08 +08:00
shuo.wang
9712bf6fb3 fix 2025-06-04 19:38:58 +08:00
shuo.wang
88865224cc fix 2025-06-04 18:40:08 +08:00
shuo.wang
bd47f46015 fix 2025-06-04 17:49:30 +08:00
shuo.wang
022b91b9fb fix 2025-06-04 17:43:23 +08:00
苏竹红
81083972ca feat:xxl 2025-06-04 17:40:43 +08:00
shuo.wang
2c50b237f8 增加接口获取店铺某阶段状态 2025-06-04 17:18:31 +08:00
shuo.wang
d3bc5baa0a Merge remote-tracking branch 'origin/cc_20250529_franchise_fee' into cc_20250529_franchise_fee 2025-06-04 16:58:43 +08:00
shuo.wang
86611d2178 数据处理代码 2025-06-04 16:58:16 +08:00
苏竹红
143df4138a feat:xxl 2025-06-04 16:50:26 +08:00
苏竹红
61ebca6b92 feat:阶段完成 2025-06-04 15:14:21 +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
a101a89c21 新管家状态枚举 2025-06-04 11:30:46 +08:00
shuo.wang
eaf416ad5e 接口移出 2025-06-04 11:30:15 +08:00
shuo.wang
735e595631 fix 2025-06-04 10:24:41 +08:00
shuo.wang
51a3da146c fix 2025-06-04 09:40:00 +08:00