Commit Graph

1690 Commits

Author SHA1 Message Date
苏竹红
d73ad8cd55 修改校验 2024-06-04 11:13:06 +08:00
苏竹红
d59123c339 修改校验 2024-06-04 10:47:35 +08:00
guohb
391be58523 Merge remote-tracking branch 'origin/cc_20240603_wantarea_bigregion' into cc_20240603_wantarea_bigregion 2024-06-04 09:42:00 +08:00
guohb
afa5cd4146 1.审批通过选战区
2.查数据时回显大区regionId
2024-06-04 09:41:38 +08:00
wangxiaopeng
2ccc641bae set大区 2024-06-04 09:40:27 +08:00
wangxiaopeng
c9ed6dc779 线索加大区 2024-06-04 09:34:42 +08:00
苏竹红
7a221f7530 防止一直在页面提交 2024-06-03 21:28:39 +08:00
苏竹红
9f2525cbdf 防止一直在页面提交 2024-06-03 17:20:00 +08:00
苏竹红
6e94ee4975 LARGE_REGION 2024-06-03 16:31:19 +08:00
苏竹红
68c209d0ca @Resource 2024-06-03 09:59:07 +08:00
guohb
4ed67b93b4 initiating 2024-05-31 19:25:49 +08:00
guohb
0959ae0dd4 分布式锁,十秒过期 2024-05-31 18:45:15 +08:00
guohb
5e8408d74f 为方法加锁 2024-05-31 17:25:55 +08:00
guohb
84a1495c03 新增加盟商 重复提交 2024-05-31 17:02:09 +08:00
苏竹红
7ac3f7725d getSpecialShopStageInfo 2024-05-30 17:24:46 +08:00
zhangchenbiao
c6a6132dab Merge branch 'cc_partner_init' into 'master'
Cc partner init

See merge request hangzhou/java/custom_xfsg!5
2024-05-29 12:50:26 +00:00
苏竹红
8875201496 getUser 2024-05-29 20:28:51 +08:00
苏竹红
c1aec2124f getUser 2024-05-29 19:55:21 +08:00
guohb
475eafb2f1 Merge remote-tracking branch 'origin/master' into cc_partener_todo
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/LineInterviewServiceImpl.java
2024-05-29 17:59:17 +08:00
guohb
9be9d4e26c fix 2024-05-29 17:50:27 +08:00
zhangchenbiao
753f4e24c6 Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init
# Conflicts:
#	coolstore-partner-web/src/main/resources/application-online.properties
2024-05-29 17:17:51 +08:00
zhangchenbiao
57b5fa2bc4 fix 2024-05-29 17:17:08 +08:00
guohb
25c3f09c56 getTrainingExperience 2024-05-29 17:03:43 +08:00
shuo.wang
8dbe6b457f 首批订货金短信 2024-05-29 15:48:45 +08:00
guohb
e9df48b730 品牌设计经理 2024-05-29 15:16:13 +08:00
guohb
1a37bdcc78 one 2024-05-29 09:35:36 +08:00
苏竹红
b310438631 Merge remote-tracking branch 'xfsg/cc_partner_init' into cc_partner_init 2024-05-28 20:23:47 +08:00
苏竹红
989dd892c2 hd 2024-05-28 20:23:36 +08:00
guohb
7a617b45a5 店长 2024-05-28 20:22:04 +08:00
guohb
ba7e5c978d message 2024-05-28 19:08:35 +08:00
zhangchenbiao
0edcefe8f6 Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init 2024-05-28 17:28:59 +08:00
zhangchenbiao
7c09e21081 上传租赁合同,修改为选址经理 2024-05-28 17:28:49 +08:00
guohb
67f0a78ed1 date 2024-05-28 15:41:15 +08:00
guohb
6041f49efa fix 2024-05-28 15:19:01 +08:00
guohb
e6a7537f00 api 2024-05-28 14:24:41 +08:00
guohb
6112fdaf67 api 2024-05-28 13:54:25 +08:00
guohb
5f1b9a77e6 api 2024-05-28 13:45:10 +08:00
guohb
77db3446d9 api 2024-05-28 13:44:40 +08:00
guohb
4ab58bf942 rm todo 2024-05-28 11:06:32 +08:00
guohb
a4de786a81 todo 2024-05-28 11:02:06 +08:00
苏竹红
53f921fe01 待审核 2024-05-28 10:51:06 +08:00
苏竹红
ecd5ae8e08 待审核 2024-05-28 10:26:57 +08:00
苏竹红
888facba28 待审核 2024-05-27 19:20:48 +08:00
wangxiaopeng
94de90562e 默认人员 2024-05-27 17:42:47 +08:00
guohb
ec5859c8d7 修改区域从regionId获取到synDingDeptId 2024-05-27 17:26:49 +08:00
guohb
18dabff82b 修改督导选择逻辑&修改证照默认值获取逻辑 2024-05-27 16:44:04 +08:00
wangxiaopeng
aff8dca1c3 区分线上测试环境 2024-05-27 15:23:54 +08:00
zhangchenbiao
e520d11358 选址经理修改为选址专员 2024-05-27 14:28:16 +08:00
guohb
b124dd9f3f fix 2024-05-27 14:16:14 +08:00
guohb
33a70a9f59 ResponseResult message
&毫秒舍弃
2024-05-27 13:58:20 +08:00