Commit Graph

2598 Commits

Author SHA1 Message Date
苏竹红
c6bf8da5b3 建店数据 2024-06-04 22:45:21 +08:00
guohb
cc68a83688 建店 2024-06-04 22:38:55 +08:00
苏竹红
c5ef4cab02 模拟数据 2024-06-04 22:20:56 +08:00
苏竹红
48a46ccff3 Merge remote-tracking branch 'origin/cc_20240603_wantarea_bigregion' into cc_20240603_wantarea_bigregion 2024-06-04 22:13:52 +08:00
苏竹红
008ac8384e 模拟数据 2024-06-04 22:13:40 +08:00
guohb
bf400ca322 Merge remote-tracking branch 'origin/cc_20240603_wantarea_bigregion' into cc_20240603_wantarea_bigregion 2024-06-04 21:51:22 +08:00
guohb
7ca9535183 重复 2024-06-04 21:51:16 +08:00
苏竹红
9d4a9b1f55 storeManagerFlag 2024-06-04 21:15:58 +08:00
guohb
02f5a84f85 fix 2024-06-04 21:03:40 +08:00
guohb
d810de8059 fix 2024-06-04 20:54:42 +08:00
wangxiaopeng
4f93a1f061 return null 2024-06-04 19:44:59 +08:00
zhangchenbiao
d63f895c25 Merge remote-tracking branch 'origin/cc_20240603_wantarea_bigregion' into cc_20240603_wantarea_bigregion 2024-06-04 19:42:59 +08:00
zhangchenbiao
da84755d71 fix 2024-06-04 19:42:47 +08:00
苏竹红
8a0354d4e1 getInvestmentManager 2024-06-04 19:18:14 +08:00
苏竹红
05ae7b7421 考试 2024-06-04 18:53:47 +08:00
苏竹红
976571b072 考试 2024-06-04 18:13:21 +08:00
zhangchenbiao
66c8099c94 上传租赁合同所属大区更改 2024-06-04 17:39:55 +08:00
guohb
d114275c7e fix 2024-06-04 16:28:08 +08:00
guohb
148ce575e8 @NotBlank 2024-06-04 16:07:59 +08:00
guohb
d098372294 redisUtilPool 2024-06-04 16:00:54 +08:00
guohb
e67ba6abdb redisUtilPool 2024-06-04 15:44:55 +08:00
guohb
8dc093df2d 新增加盟商锁更改 2024-06-04 14:11:06 +08:00
苏竹红
3e16248c3b 大区 2024-06-04 13:43:24 +08:00
苏竹红
f35a2cc548 大区 2024-06-04 13:19:44 +08:00
苏竹红
d73ad8cd55 修改校验 2024-06-04 11:13:06 +08:00
苏竹红
1e48459f3d 修改校验 2024-06-04 11:02:45 +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
zhangchenbiao
c6b86c4f6b Merge branch 'cc_20240530_bugfix' into 'master'
getSpecialShopStageInfo

See merge request hangzhou/java/custom_xfsg!6
2024-05-30 09:28:08 +00: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
苏竹红
c5483c4866 shop_id 2024-05-29 20:43:50 +08:00
苏竹红
8875201496 getUser 2024-05-29 20:28:51 +08:00
苏竹红
c1aec2124f getUser 2024-05-29 19:55:21 +08:00
shuo.wang
5f7314cd38 首批订货金短信 2024-05-29 19:10:11 +08:00
zhangchenbiao
ca4e400d81 Merge branch 'cc_partener_todo' into 'master'
todo

See merge request hangzhou/java/custom_xfsg!4
2024-05-29 10:00:04 +00: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
491960ca3f Merge branch 'cc_partner_init' into 'master'
fix

See merge request hangzhou/java/custom_xfsg!3
2024-05-29 09:44:46 +00:00