Commit Graph

2657 Commits

Author SHA1 Message Date
苏竹红
d504d3ff2c 待补充 2024-06-25 15:21:51 +08:00
苏竹红
06666ea419 装修阶段 2024-06-25 15:09:16 +08:00
苏竹红
50ae1f4ce4 培训登记优化 2024-06-21 17:16:36 +08:00
苏竹红
788c968289 资质审核 2024-06-21 16:41:32 +08:00
苏竹红
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
苏竹红
9e233b1628 招商经理 2024-06-19 16:39:05 +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
苏竹红
998909c522 加盟商编码 2024-06-19 09:53:15 +08:00
苏竹红
cc11f58a56 线索 2024-06-19 09:31:09 +08:00
苏竹红
2180c75a64 加盟状态 2024-06-18 15:03:28 +08:00
苏竹红
5c05ff1635 coolcollege_intelligent_74 2024-06-18 14:28:29 +08:00
苏竹红
a65bc8ca84 coolcollege_intelligent_74 2024-06-17 16:43:55 +08:00
苏竹红
7c5c60467b 端口 2024-06-17 16:22:34 +08:00
苏竹红
5a6321adf3 enterpriseId 2024-06-17 15:53:02 +08:00
苏竹红
2b9fe8bad1 端口 50000 2024-06-17 15:50:21 +08:00
苏竹红
5c96164526 zxjp 2024-06-17 15:28:04 +08:00
王晓鹏
474d5673ea Merge branch 'cc_20240606_lastFix' into 'master'
last_time

See merge request hangzhou/java/custom_xfsg!16
2024-06-06 06:41:45 +00:00
苏竹红
2ab2ab82bc last_time 2024-06-06 14:40:43 +08:00
zhangchenbiao
d6364f1754 Merge branch 'cc_20240606_lastFix' into 'master'
last_time

See merge request hangzhou/java/custom_xfsg!15
2024-06-06 06:32:01 +00:00
苏竹红
56cfad85b8 last_time 2024-06-06 14:28:21 +08:00
zhangchenbiao
f46f62a3a5 Merge branch 'cc_20240606_lastFix' into 'master'
fix

See merge request hangzhou/java/custom_xfsg!14
2024-06-06 03:24:43 +00: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
zhangchenbiao
7d48cd43cb Merge branch 'cc_20240606_lastFix' into 'master'
order

See merge request hangzhou/java/custom_xfsg!13
2024-06-06 03:05:54 +00:00
苏竹红
8a0ed9ca6e order 2024-06-06 11:04:18 +08:00
zhangchenbiao
588d2665ef Merge branch 'cc_20240606_lastFix' into 'master'
Cc 20240606 last fix

See merge request hangzhou/java/custom_xfsg!12
2024-06-06 03:01:18 +00:00
苏竹红
6241fa7cb3 order 2024-06-06 10:57:31 +08:00
guohb
ad02a8de07 stream判空 2024-06-06 10:50:19 +08:00
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