Commit Graph

2768 Commits

Author SHA1 Message Date
苏竹红
14b5060cdd feat:detailAddress 2024-10-09 19:21:56 +08:00
苏竹红
983c6e6bbb feat:detailAddress 2024-10-09 19:19:08 +08:00
苏竹红
2e98b4a3f5 feat:detailAddress 2024-10-09 18:05:16 +08:00
苏竹红
0e1080b0e3 feat:省市区 2024-10-09 18:01:42 +08:00
shuo.wang
8855a22abd Merge remote-tracking branch 'origin/cc_20241008_sysBuildAndAdjust' into cc_20241008_sysBuildAndAdjust 2024-10-09 17:07:49 +08:00
shuo.wang
fcc38b2aef 建店资料收集 2024-10-09 17:07:19 +08:00
shuo.wang
c98c5ae187 建店资料收集 2024-10-09 17:07:05 +08:00
苏竹红
7699f968fa Merge remote-tracking branch 'origin/cc_20241008_sysBuildAndAdjust' into cc_20241008_sysBuildAndAdjust 2024-10-09 17:03:12 +08:00
苏竹红
c53863f0ee feat:证照改造 2024-10-09 17:02:44 +08:00
shuo.wang
d06c08c126 Merge remote-tracking branch 'origin/cc_20241008_sysBuildAndAdjust' into cc_20241008_sysBuildAndAdjust 2024-10-09 16:26:22 +08:00
shuo.wang
f7e3ef7679 shopList增加能否修改shopCode 标识 2024-10-09 16:25:48 +08:00
苏竹红
4c7e9449de feat:阶段数据 2024-10-09 15:55:21 +08:00
苏竹红
34448d7964 Merge remote-tracking branch 'origin/cc_20241008_sysBuildAndAdjust' into cc_20241008_sysBuildAndAdjust 2024-10-09 15:53:24 +08:00
苏竹红
497d7b48f5 feat:阶段数据 2024-10-09 15:53:13 +08:00
shuo.wang
340bcf91a6 平台建店, pos 施工阶段,订货系统 实体类,mapper等 2024-10-09 15:03:13 +08:00
苏竹红
7d263940ac feat:阶段数据 2024-10-09 13:43:10 +08:00
苏竹红
38de8d25df feat:阶段数据 2024-10-09 13:36:43 +08:00
shuo.wang
676b4a89ec 修改shopCode接口 2024-10-09 11:11:10 +08:00
shuo.wang
d88c89327a 阶段 2024-10-09 10:08:09 +08:00
zhangchenbiao
29a9222dd1 fix 2024-09-29 10:25:47 +08:00
苏竹红
b21098fea1 feat:oss配置切换 2024-09-27 10:17:38 +08:00
苏竹红
2a67a8ce7b Merge branch 'cc_20240918_data_insulate' into 'master'
数据隔离

See merge request hangzhou/java/custom_zxjp!18
2024-09-26 09:33:49 +00:00
苏竹红
49b181af5d feat:oss配置切换 2024-09-25 17:03:28 +08:00
苏竹红
be0063b19d feat:数据隔离 2024-09-25 10:11:24 +08:00
苏竹红
4ffb211b48 feat:数据隔离 2024-09-23 15:28:17 +08:00
zhangchenbiao
5a0996ed17 修改rocket mq ak sk 2024-09-11 17:07:38 +08:00
苏竹红
75e50f1683 Merge branch 'cc_20240819_first_level_approve' into 'master'
feat:一级审批

See merge request hangzhou/java/custom_zxjp!17
2024-08-23 02:12:02 +00:00
苏竹红
ab6d161940 feat:一级审批 2024-08-19 17:45:02 +08:00
苏竹红
39d6dba87a Merge branch 'cc_20240806_skip_assessment_report' into 'master'
招商经理—强加盟

See merge request hangzhou/java/custom_zxjp!16
2024-08-08 06:18:35 +00:00
苏竹红
897784f365 招商经理—强加盟 2024-08-07 10:58:38 +08:00
苏竹红
ec18409500 Merge branch 'cc_20240806_skip_assessment_report' into 'master'
developmentManagerUserId

See merge request hangzhou/java/custom_zxjp!14
2024-08-06 07:11:25 +00:00
苏竹红
540fade201 developmentManagerUserId 2024-08-06 15:09:39 +08:00
苏竹红
01815e9449 Merge branch 'cc_20240806_skip_assessment_report' into 'master'
加盟费

See merge request hangzhou/java/custom_zxjp!13
2024-08-06 06:41:41 +00:00
苏竹红
f6c83ea336 加盟费 2024-08-06 14:41:15 +08:00
苏竹红
928e2ec2ac Merge branch 'cc_20240806_skip_assessment_report' into 'master'
Cc 20240806 skip assessment report

See merge request hangzhou/java/custom_zxjp!12
2024-08-06 01:55:03 +00:00
苏竹红
2832d9d89c 加盟方式 2024-08-05 16:39:42 +08:00
苏竹红
6661ea6827 铺位处理 2024-08-05 11:16:28 +08:00
苏竹红
de4c9412bf 铺位处理 2024-08-05 10:03:05 +08:00
苏竹红
d02b92a679 Merge branch 'cc_20240723_distribution' into 'master'
Cc 20240723 distribution

See merge request hangzhou/java/custom_zxjp!11
2024-07-23 02:31:43 +00:00
苏竹红
1cb27c57e0 如果招商经理是空 返回空 2024-07-22 14:19:55 +08:00
苏竹红
25db7d4685 意向ID 2024-07-22 10:29:45 +08:00
苏竹红
f8b71ecc55 线索批量分配 2024-07-19 18:58:41 +08:00
苏竹红
b10ed6eea3 线索批量分配 2024-07-19 16:26:57 +08:00
苏竹红
ab9d969788 线索分配 2024-07-18 21:33:37 +08:00
苏竹红
adf9848e04 线索返回 2024-07-18 17:52:20 +08:00
苏竹红
7b1b86d66f Merge branch 'cc_20240411_supportskip' into 'master'
Cc 20240411 supportskip

See merge request hangzhou/java/custom_zxjp!10
2024-07-18 02:59:18 +00:00
苏竹红
f424c23179 条件控制 2024-07-17 15:29:24 +08:00
苏竹红
5b29cdd0f9 条件控制 2024-07-16 16:29:52 +08:00
苏竹红
5d46a10b4f Merge remote-tracking branch 'origin/master' into cc_20240411_supportskip
# Conflicts:
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java
2024-07-16 16:13:09 +08:00
苏竹红
56e915919c 支持跳过 2024-07-16 16:12:15 +08:00