Commit Graph

3068 Commits

Author SHA1 Message Date
5c06c0105b 增加查询地图车站列表接口;修改仿真成员设备查找逻辑bug; 2022-10-17 14:52:34 +08:00
xzb
158d436a61 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-10-17 14:45:17 +08:00
xzb
4f1029f5b6 paper 2022-10-17 14:45:01 +08:00
xzb
3b944a63db paper 2022-10-17 14:43:28 +08:00
weizhihong
7547b6b14b 【选择组织修改登录信息】 2022-10-17 14:23:57 +08:00
tiger_zhou
bc0969e6e5 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-10-17 14:19:31 +08:00
tiger_zhou
c68978cd1b 理论试题管理代码调整 2022-10-17 14:19:13 +08:00
xzb
47388d250e Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-10-17 14:18:26 +08:00
xzb
c9e16545d4 paper 2022-10-17 14:17:27 +08:00
tiger_zhou
1910f7a1c7 理论试题管理代码调整 2022-10-17 14:02:05 +08:00
tiger_zhou
6f404ceb88 理论试题管理代码调整 2022-10-17 13:20:45 +08:00
tiger_zhou
5f08745963 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-10-17 08:54:41 +08:00
xzb
b3ecb6c1d2 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-10-14 17:51:41 +08:00
xzb
7a0b9eb2de paper 2022-10-14 17:51:05 +08:00
tiger_zhou
b8cf53b572 理论试题管理代码调整 2022-10-14 17:05:50 +08:00
tiger_zhou
b3e770f6fa Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-10-14 16:45:05 +08:00
tiger_zhou
0c0cf91f2b 理论试题管理代码调整,查询标签支持单一的类型 2022-10-14 16:44:48 +08:00
xzb
3cbe689658 paper 2022-10-14 16:44:24 +08:00
xzb
500eb26183 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-10-14 16:34:02 +08:00
xzb
7159663aec permission 2022-10-14 16:33:30 +08:00
tiger_zhou
016f6c8c48 理论试题管理代码调整 2022-10-14 16:26:19 +08:00
tiger_zhou
6f42bfbe9c 理论试题管理代码调整 2022-10-14 16:10:24 +08:00
tiger_zhou
f2293c35f2 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-10-14 16:08:22 +08:00
tiger_zhou
8d1c1c6c09 理论试题管理代码调整及添加数量获取方法 2022-10-14 16:08:00 +08:00
9e0026e622 Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-10-14 14:59:21 +08:00
f847b2e4d6 Merge remote-tracking branch 'origin/test-training2' into test-training2
# Conflicts:
#	src/main/java/club/joylink/rtss/simulation/cbtc/Simulation.java
2022-10-14 14:58:30 +08:00
tiger_zhou
d099cbccf1 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-10-14 14:58:21 +08:00
b50d1ead24 新仿真结构完善中 2022-10-14 14:57:30 +08:00
tiger_zhou
c2dcc93b91 权限功能管理相关管理代码调整 2022-10-14 14:57:22 +08:00
weizhihong
6f17d72983 【查询教师列表、增加教师信息】 2022-10-14 14:55:52 +08:00
xzb
d9828671c7 permission 2022-10-14 14:25:02 +08:00
xzb
e577e255a9 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-10-14 13:33:42 +08:00
xzb
ab117af819 paper permission 2022-10-14 13:33:09 +08:00
tiger_zhou
5a60700246 功能权限在删除的时候检测rts_permission_system_ability 表中是否有对应的数据如果没有就删除数据 2022-10-14 13:26:43 +08:00
tiger_zhou
b3d131ff56 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-10-14 13:25:24 +08:00
tiger_zhou
685b3ec4fa 理论试题管理代码调整,支持查询分页标签检索 2022-10-14 13:25:07 +08:00
tiger_zhou
f3925f8cdb 理论试题管理代码调整,支持查询分页标签检索 2022-10-14 13:24:52 +08:00
xzb
b8d1d81ac9 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-10-14 11:03:41 +08:00
xzb
2153363e48 paper permission 2022-10-14 11:03:21 +08:00
tiger_zhou
6da5f3a5ac Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-10-14 10:25:56 +08:00
tiger_zhou
80307e835d 理论试题管理代码调整,支持乱序预览及测试答题 2022-10-14 10:25:40 +08:00
xzb
27f95fdc96 permission 2022-10-14 09:34:35 +08:00
xzb
6fa2a1b105 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-10-13 17:49:13 +08:00
xzb
de0bb265d8 permission 2022-10-13 17:48:52 +08:00
tiger_zhou
676ee99043 功能管理相关管理代码调整 2022-10-13 17:38:19 +08:00
tiger_zhou
603cd9d0e8 功能管理相关管理 2022-10-13 17:37:16 +08:00
weizhihong
76066aa2dd 【编码修改为模糊查询】 2022-10-13 17:22:13 +08:00
weizhihong
54241ee9a1 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2 2022-10-13 16:46:09 +08:00
weizhihong
78fadf8721 【默认组织逻辑】 2022-10-13 16:45:59 +08:00
xzb
e54db545cf Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-10-13 16:38:09 +08:00