zhangchenbiao
|
b88b93b057
|
Merge branch 'cc_20240606_lastFix' into 'master'
判空
See merge request hangzhou/java/custom_xfsg!11
|
2024-06-06 02:48:25 +00:00 |
|
guohb
|
28fab7c2b7
|
判空
|
2024-06-06 10:41:40 +08:00 |
|
杨杰
|
3365710d12
|
Merge branch 'cc_20240603_wantarea_bigregion' into 'master'
Cc 20240603 wantarea bigregion
See merge request hangzhou/java/custom_xfsg!10
|
2024-06-06 01:24:28 +00:00 |
|
苏竹红
|
a74fef99b6
|
店长不要中括号
|
2024-06-05 22:55:46 +08:00 |
|
苏竹红
|
dca48c988e
|
Merge remote-tracking branch 'origin/cc_20240605_feat' into cc_20240603_wantarea_bigregion
|
2024-06-05 21:15:04 +08:00 |
|
guohb
|
04d8b808cb
|
更改督导逻辑-是否有角色
|
2024-06-05 21:13:34 +08:00 |
|
苏竹红
|
4d89bb96fa
|
Merge remote-tracking branch 'origin/cc_20240605_feat' into cc_20240603_wantarea_bigregion
|
2024-06-05 21:04:52 +08:00 |
|
guohb
|
60ba1d54d6
|
更改督导逻辑
|
2024-06-05 20:59:49 +08:00 |
|
guohb
|
f6fcdcd6d8
|
更改督导逻辑
|
2024-06-05 20:58:56 +08:00 |
|
苏竹红
|
986080a9ae
|
Merge remote-tracking branch 'origin/cc_20240605_feat' into cc_20240603_wantarea_bigregion
# Conflicts:
# coolstore-partner-dao/src/main/java/com/cool/store/mapper/SystemBuildingShopMapper.java
# coolstore-partner-dao/src/main/resources/mapper/SystemBuildingShopMapper.xml
|
2024-06-05 20:22:45 +08:00 |
|
苏竹红
|
31550757b1
|
Merge remote-tracking branch 'origin/cc_20240605_fix' into cc_20240603_wantarea_bigregion
|
2024-06-05 20:17:21 +08:00 |
|
guohb
|
7ba6b0d709
|
多端同时提交
|
2024-06-05 18:01:14 +08:00 |
|
guohb
|
4a433d7743
|
多端同时提交
|
2024-06-05 17:58:27 +08:00 |
|
guohb
|
fa5f9f7467
|
feat3
|
2024-06-05 16:45:08 +08:00 |
|
guohb
|
3234b26cd9
|
feat2
|
2024-06-05 16:35:32 +08:00 |
|
苏竹红
|
3f88f78745
|
云立方报错信息修改
|
2024-06-05 16:29:50 +08:00 |
|
guohb
|
9790e7e354
|
Merge remote-tracking branch 'origin/master' into cc_20240605_feat
|
2024-06-05 16:26:16 +08:00 |
|
guohb
|
5a000a74f1
|
feat
|
2024-06-05 16:25:47 +08:00 |
|
zhangchenbiao
|
bf5024729d
|
Merge branch 'cc_20240603_wantarea_bigregion' into 'master'
license
See merge request hangzhou/java/custom_xfsg!9
|
2024-06-05 07:11:58 +00:00 |
|
苏竹红
|
ccc5d4b608
|
license
|
2024-06-05 15:10:55 +08:00 |
|
zhangchenbiao
|
2ce51efe35
|
Merge branch 'cc_20240603_wantarea_bigregion' into 'master'
Cc 20240603 wantarea bigregion
See merge request hangzhou/java/custom_xfsg!8
|
2024-06-05 01:49:28 +00:00 |
|
苏竹红
|
c791d2b45e
|
建店数据
|
2024-06-04 23:08:22 +08:00 |
|
苏竹红
|
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 |
|