Commit Graph

3627 Commits

Author SHA1 Message Date
苏竹红
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
苏竹红
3b88a482c5 feat:加盟合同老店新开装修与开业直接完成 2025-05-14 14:16:31 +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
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
苏竹红
f04977cc7e Merge branch 'cc_20250509_import_data' into 'master'
Cc 20250509 import data

See merge request hangzhou/java/custom_zxjp!74
2025-05-12 11:28:30 +00:00
shuo.wang
2ff9e6fc2b fix 2025-05-12 19:26:21 +08:00
shuo.wang
df2f7e1e07 fix 2025-05-12 19:06:08 +08:00
shuo.wang
3564fb1bfb fix 2025-05-12 18:32:38 +08:00
苏竹红
79f7956dfd Merge branch 'cc_20250509_approve' into 'master'
Cc 20250509 approve

See merge request hangzhou/java/custom_zxjp!73
2025-05-12 10:13:34 +00:00
苏竹红
df544d751a Merge branch 'master' into cc_20250509_approve 2025-05-12 18:07:09 +08:00
shuo.wang
7ad8e919f4 fix 2025-05-12 17:28:58 +08:00
shuo.wang
67f80d13d3 老数据数据处理 2025-05-12 17:14:57 +08:00
shuo.wang
db4c7b2bd9 老数据数据处理 2025-05-12 17:12:05 +08:00
苏竹红
b15c9eed79 feat:askbot 门店获取方式变更 2025-05-12 10:38:19 +08:00
苏竹红
6e2274af88 Merge branch 'cc_20250509_approve' into 'master'
Cc 20250509 approve

See merge request hangzhou/java/custom_zxjp!72
2025-05-09 09:33:16 +00:00
苏竹红
66202bfca8 feat:新管家 2025-05-09 15:54:58 +08:00
苏竹红
9939a7c1aa feat:新管家 2025-05-09 15:10:44 +08:00
苏竹红
ec2b78b4dd Merge branch 'cc_sign_20250507' into 'master'
Cc sign 20250507

See merge request hangzhou/java/custom_zxjp!71
2025-05-09 06:17:05 +00:00
苏竹红
4e0a064f10 feat:修改状态 2025-05-08 22:09:29 +08:00
苏竹红
09c6486fea feat:xxl 2025-05-08 22:02:55 +08:00
苏竹红
166510ab72 Merge remote-tracking branch 'origin/cc_sign_20250507' into cc_sign_20250507 2025-05-08 21:51:36 +08:00
苏竹红
b96f00d1f2 feat:xxl 2025-05-08 21:50:57 +08:00
shuo.wang
f0c99d9127 feat:选址阶段 地址优化 2025-05-08 17:10:31 +08:00
shuo.wang
2c0d9c9ec6 feat:选址阶段 地址优化 2025-05-08 17:07:16 +08:00
shuo.wang
f645122919 feat:选址阶段 地址优化 2025-05-08 17:04:39 +08:00