Commit Graph

3648 Commits

Author SHA1 Message Date
shuo.wang
4d37951e46 推数数据云流水账号加前缀 2025-05-16 17:18:21 +08:00
shuo.wang
4227ad9d45 处理数据接口 2025-05-16 15:25:58 +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
shuo.wang
f5e6194272 fix 导出 2025-05-13 14:31:37 +08:00
shuo.wang
f2c9dfd389 fix 导出 2025-05-13 14:25:44 +08:00
shuo.wang
7c2f72903d fix 2025-05-13 14:16:40 +08:00
shuo.wang
871f47acf8 导出加字段 2025-05-13 14:14:22 +08:00
shuo.wang
e7eb270fec Merge branch 'master' into cc_20250513 2025-05-13 14:14:11 +08:00
苏竹红
20d5a68f13 Merge branch 'cc_20250513_fix' into 'master'
Cc 20250513 fix

See merge request hangzhou/java/custom_zxjp!77
2025-05-13 03:56:01 +00:00
shuo.wang
1867bbbde5 fix 2025-05-13 11:54:49 +08:00
shuo.wang
465afd42eb Merge branch 'cc_20250513_fix' into cc_20250513 2025-05-13 11:02:48 +08:00
shuo.wang
d7a7468c89 fix 2025-05-13 11:02:19 +08:00
shuo.wang
e610035467 Merge branch 'cc_20250513_fix' into cc_20250513 2025-05-13 10:40:46 +08:00
shuo.wang
9d16956755 fix 2025-05-13 10:40:19 +08:00
shuo.wang
d9af75edca fix 2025-05-13 10:33:51 +08:00
苏竹红
3e8a2d272e Merge branch 'cc_20250509_import_data' into 'master'
fix

See merge request hangzhou/java/custom_zxjp!76
2025-05-12 12:27:59 +00:00
shuo.wang
9d792bf8b4 fix 2025-05-12 20:26:11 +08:00
苏竹红
1899bbc65f Merge branch 'cc_20250509_import_data' into 'master'
fix

See merge request hangzhou/java/custom_zxjp!75
2025-05-12 12:05:31 +00:00
shuo.wang
9dfd7c5fca fix 2025-05-12 20:00:40 +08:00