Commit Graph

3664 Commits

Author SHA1 Message Date
苏竹红
cfefb0fe34 Merge branch 'cc_20250513_franchise_report' into 'master'
报表导出

See merge request hangzhou/java/custom_zxjp!86
2025-05-16 10:22:36 +00:00
shuo.wang
3de0a3aef6 报表导出 2025-05-16 18:18:50 +08:00
苏竹红
f9922e58ac Merge branch 'cc_20250513_franchise_report' into 'master'
Cc 20250513 franchise report

See merge request hangzhou/java/custom_zxjp!85
2025-05-16 09:21:42 +00:00
shuo.wang
74b3ba88b9 推数数据云流水账号取消前缀 2025-05-16 17:20:34 +08:00
shuo.wang
54f1fc161e 推数数据云流水账号加前缀 2025-05-16 17:20:06 +08:00
苏竹红
1a55f80890 Merge branch 'cc_20250513_franchise_report' into 'master'
Cc 20250513 franchise report

See merge request hangzhou/java/custom_zxjp!84
2025-05-16 09:16:00 +00:00
shuo.wang
988c0bc7cd 推数数据云流水账号加前缀 2025-05-16 16:23:33 +08:00
shuo.wang
8ec0939ecc PC端加盟报表 2025-05-16 15:37:47 +08:00
shuo.wang
28b3851c71 统计报表接口,数据梳理接口 2025-05-16 13:30:43 +08:00
shuo.wang
4c243b31ea 统计报表接口,数据梳理接口 2025-05-16 13:25:39 +08:00
shuo.wang
81263112d5 统计报表接口,数据梳理接口 2025-05-16 13:18:59 +08:00
shuo.wang
8d7d1580e3 统计报表接口,数据梳理接口 2025-05-16 11:09:22 +08:00
shuo.wang
c65dd376f3 统计报表接口,数据梳理接口 2025-05-16 10:56:49 +08:00
shuo.wang
234789f88f 统计报表接口,数据梳理接口 2025-05-16 10:47:37 +08:00
shuo.wang
9ad46e8943 统计报表接口,数据梳理接口 2025-05-16 10:28:55 +08:00
shuo.wang
83f2dcb7c0 统计报表接口,数据梳理接口 2025-05-16 10:19:46 +08:00
shuo.wang
a4d2d0a71a 统计报表接口,数据梳理接口 2025-05-16 10:09:37 +08:00
shuo.wang
1f949ac459 统计报表接口,数据梳理接口 2025-05-16 10:08:16 +08:00
苏竹红
d857501b36 Merge branch 'cc_20250513_franchise_report' into 'master'
fix

See merge request hangzhou/java/custom_zxjp!83
2025-05-15 12:04:48 +00:00
shuo.wang
3c2f97d2f6 fix 2025-05-15 19:00:55 +08:00
苏竹红
a8993e9b60 Merge branch 'cc_20250513_franchise_report' into 'master'
Cc 20250513 franchise report

See merge request hangzhou/java/custom_zxjp!82
2025-05-15 10:14:23 +00:00
苏竹红
faadd18fd4 Merge branch 'cc_20250514_approve_notice' into 'master'
Cc 20250514 approve notice

See merge request hangzhou/java/custom_zxjp!81
2025-05-15 10:14:14 +00:00
shuo.wang
e344acc7de fix 2025-05-15 18:12:15 +08:00
shuo.wang
45feec8a1b 统计报表接口,数据梳理接口 2025-05-15 18:09:08 +08:00
shuo.wang
94e187df1c 统计报表接口,数据梳理接口 2025-05-15 18:04:43 +08:00
shuo.wang
bd3fa05bf2 统计报表接口,数据梳理接口 2025-05-15 17:58:06 +08:00
苏竹红
cf5af4cb77 feat:自有店财务 2025-05-15 17:05:00 +08:00
shuo.wang
369f93b1a2 Merge branch 'master' into cc_20250513_franchise_report 2025-05-15 16:30:12 +08:00
shuo.wang
f253b2a0c3 统计报表接口,数据梳理接口 2025-05-15 15:31:23 +08:00
苏竹红
14035dee4b feat:自有店逻辑修改 2025-05-15 14:01:44 +08:00
苏竹红
9e324de66f feat:阶段数据 2025-05-15 10:55:01 +08:00
shuo.wang
177ff32f58 报表列表接口 2025-05-14 17:33:32 +08:00
苏竹红
c3d2ec4832 Merge branch 'cc_20250514_approve_notice' into 'master'
feat:阶段数据

See merge request hangzhou/java/custom_zxjp!80
2025-05-14 09:14:22 +00:00
苏竹红
b701aeb4eb Merge branch 'cc_20250514_oldShopOpen' into 'master'
Cc 20250514 old shop open

See merge request hangzhou/java/custom_zxjp!79
2025-05-14 09:14:16 +00:00
苏竹红
d6c8aec473 feat:阶段数据 2025-05-14 16:32:54 +08:00
苏竹红
4d7efab991 feat:阶段数据 2025-05-14 15:13:22 +08:00
苏竹红
0bb785d471 feat:fix 2025-05-14 14:45:23 +08:00
苏竹红
9103d10ddf feat:加盟合同老店新开装修与开业直接完成 2025-05-14 14:37:34 +08:00
shuo.wang
f09b89b5fe 报表列表接口 2025-05-14 14:20:27 +08:00
苏竹红
3b88a482c5 feat:加盟合同老店新开装修与开业直接完成 2025-05-14 14:16:31 +08:00
shuo.wang
3137d9d7f4 Merge branch 'master' into cc_20250513_franchise_report 2025-05-14 13:35:51 +08:00
shuo.wang
dd3aa88833 fix 2025-05-14 10:37:31 +08:00
shuo.wang
11de076ba2 合代码 2025-05-14 10:02:43 +08:00
苏竹红
9a9db19ff5 Merge branch 'cc_20250513' into 'master'
Cc 20250513

See merge request hangzhou/java/custom_zxjp!78
2025-05-13 10:32:11 +00:00
shuo.wang
7233f12a16 fix 2025-05-13 18:04:24 +08:00
shuo.wang
550be8c205 fix 2025-05-13 18:02:46 +08:00
shuo.wang
91a5e8034d fix 2025-05-13 18:01:52 +08:00
shuo.wang
e6ea93938b fix 2025-05-13 17:03:02 +08:00
shuo.wang
176e403813 加盟报表代码 2025-05-13 17:00:13 +08:00
shuo.wang
2bf1ddea47 提交建店资料加锁防止重复提交 2025-05-13 15:02:55 +08:00