Commit Graph

2722 Commits

Author SHA1 Message Date
苏竹红
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
苏竹红
aefcd78909 Merge branch 'cc_20240716_partner_mode' into 'master'
Cc 20240716 partner mode

See merge request hangzhou/java/custom_zxjp!9
2024-07-16 01:55:40 +00:00
苏竹红
589dcfebba 新增线索 2024-07-15 14:02:53 +08:00
苏竹红
af6ec77b26 修改加盟模式 2024-07-12 17:03:13 +08:00
苏竹红
cf4c18d7f4 加盟模式 2024-07-12 16:33:36 +08:00
苏竹红
9f9ec026a4 加盟模式 2024-07-12 16:27:36 +08:00
苏竹红
53f63f22ce 支持跳过 2024-07-12 14:50:24 +08:00
苏竹红
be9478ab10 bug修复 2024-07-11 19:34:56 +08:00
苏竹红
9d27c807be Merge branch 'cc_20240702_v1.0.1' into 'master'
Cc 20240702 v1.0.1

See merge request hangzhou/java/custom_zxjp!8
2024-07-04 07:50:55 +00:00
苏竹红
17f75658b7 setBigRegion 2024-07-04 15:49:18 +08:00
苏竹红
eb81ec0da0 user 2024-07-04 14:02:45 +08:00
苏竹红
4516623873 getRemark 2024-07-03 18:26:42 +08:00
苏竹红
d658eba78b setUnifiedSocialCreditCode 2024-07-03 16:48:51 +08:00
苏竹红
f897e85969 督导 2024-07-03 15:11:30 +08:00
苏竹红
61622f4086 大区概念 2024-07-02 20:19:42 +08:00
苏竹红
86dee574fc 大区概念 2024-07-02 20:05:58 +08:00
苏竹红
cd48677507 大区概念 2024-07-02 16:50:09 +08:00
杨杰
3636a2189f Merge branch 'cc_20240613_zxjp_init' into 'master'
Cc 20240613 zxjp init

See merge request hangzhou/java/custom_zxjp!6
2024-06-28 02:06:25 +00:00
苏竹红
2adcc0d6f9 提交 2024-06-28 10:04:16 +08:00
苏竹红
79f8b04ac8 jobNum不显示 2024-06-27 15:55:03 +08:00
zhangchenbiao
7b4a925b5c Merge branch 'cc_20240613_zxjp_init' into 'master'
数据源

See merge request hangzhou/java/custom_zxjp!5
2024-06-27 07:08:37 +00:00
苏竹红
eed01b927c 数据源 2024-06-27 15:06:38 +08:00
苏竹红
569957c40e 数据源 2024-06-27 15:04:10 +08:00
苏竹红
2683283c7a 数据源 2024-06-27 15:02:20 +08:00
zhangchenbiao
b4910f6d7b Merge branch 'cc_20240613_zxjp_init' into 'master'
coolcollege

See merge request hangzhou/java/custom_zxjp!4
2024-06-27 06:49:51 +00:00
苏竹红
b2c657b9e6 coolcollege 2024-06-27 14:48:27 +08:00
杨杰
ae486d04ce Merge branch 'cc_20240613_zxjp_init' into 'master'
Cc 20240613 zxjp init

See merge request hangzhou/java/custom_zxjp!3
2024-06-27 06:36:32 +00:00
苏竹红
873ddbadb5 灰度配置修改 2024-06-27 14:31:05 +08:00
苏竹红
259372846e zxjp-web 2024-06-27 14:04:21 +08:00
zhangchenbiao
40b4bfb990 Merge branch 'cc_20240613_zxjp_init' into 'master'
测试

See merge request hangzhou/java/custom_zxjp!2
2024-06-27 05:48:40 +00:00
苏竹红
973526c2a6 测试 2024-06-27 13:45:48 +08:00
杨杰
a413dc1b59 Merge branch 'cc_20240613_zxjp_init' into 'master'
Cc 20240613 zxjp init

See merge request hangzhou/java/custom_zxjp!1
2024-06-27 02:41:20 +00:00
杨杰
c85bd72bbf Merge branch 'master' into 'cc_20240613_zxjp_init'
# Conflicts:
#   README.md
2024-06-27 02:40:44 +00:00
苏竹红
bf3900e90d application 2024-06-27 10:21:35 +08:00
苏竹红
6d4553d058 修改jar名称 2024-06-27 10:18:53 +08:00
苏竹红
49c9cae025 bug 修复 2024-06-26 21:20:43 +08:00
苏竹红
d4fc6eb319 bug 修复 2024-06-26 21:14:49 +08:00
苏竹红
594b5f1f8f bug 修复 2024-06-26 20:50:38 +08:00
苏竹红
7a632176f1 线上小程序appId 2024-06-26 20:16:21 +08:00
苏竹红
29a502dab4 weixin.appId 2024-06-26 19:31:50 +08:00
苏竹红
17d82e50de 签约时间 2024-06-26 19:18:30 +08:00
苏竹红
cea021d203 筹建详情 2024-06-26 18:07:59 +08:00
苏竹红
3ef3665909 去掉短信 2024-06-26 17:56:22 +08:00
苏竹红
96cb604198 qualificationsInfoDO 2024-06-26 16:34:29 +08:00
苏竹红
a082bc2c0f 加盟费大写 2024-06-26 15:52:45 +08:00
苏竹红
4caba95b45 装修阶段 2024-06-26 11:09:22 +08:00
苏竹红
1368341adf 装修阶段 2024-06-26 11:05:26 +08:00