Commit Graph

1751 Commits

Author SHA1 Message Date
苏竹红
8afaf7071f 督导是招商经理 2024-06-20 10:29:24 +08:00
苏竹红
99f6b3cf3b OA 2024-06-19 19:24:27 +08:00
苏竹红
123a6bd59e OA 2024-06-19 19:13:45 +08:00
苏竹红
658661d409 OA 2024-06-19 19:05:51 +08:00
苏竹红
6840bcbfa4 employeeTrainingDAO 2024-06-19 17:40:32 +08:00
苏竹红
fe76137e1a setShopCode 2024-06-19 17:25:17 +08:00
苏竹红
056247e761 setShopCode 2024-06-19 17:02:14 +08:00
苏竹红
62262a0a97 招商经理 2024-06-19 16:36:38 +08:00
苏竹红
b756112031 getUserInfoByIdCard 2024-06-19 16:21:26 +08:00
苏竹红
048ab859e8 筹建阶段 2024-06-19 15:55:26 +08:00
苏竹红
d0c6d77a36 加盟商编码 2024-06-19 14:01:37 +08:00
苏竹红
cc11f58a56 线索 2024-06-19 09:31:09 +08:00
苏竹红
5c05ff1635 coolcollege_intelligent_74 2024-06-18 14:28:29 +08:00
苏竹红
2ab2ab82bc last_time 2024-06-06 14:40:43 +08:00
苏竹红
56cfad85b8 last_time 2024-06-06 14:28:21 +08:00
苏竹红
d0a0c3ba1f Merge remote-tracking branch 'origin/cc_20240606_lastFix' into cc_20240606_lastFix 2024-06-06 11:21:36 +08:00
guohb
705d3f52ca fix 2024-06-06 11:18:42 +08:00
苏竹红
8a0ed9ca6e order 2024-06-06 11:04:18 +08:00
苏竹红
6241fa7cb3 order 2024-06-06 10:57:31 +08:00
guohb
ad02a8de07 stream判空 2024-06-06 10:50:19 +08:00
guohb
28fab7c2b7 判空 2024-06-06 10:41:40 +08: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
苏竹红
ccc5d4b608 license 2024-06-05 15:10:55 +08: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