Commit Graph

2682 Commits

Author SHA1 Message Date
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
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
xzb
5b61c9bef6 permission 2022-10-13 16:37:46 +08:00
tiger_zhou
123dc43dc3 理论试题管理代码调整 2022-10-13 15:33:37 +08:00
xzb
2955125f76 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-10-13 15:07:21 +08:00
xzb
106c16aedb permission 2022-10-13 15:07:03 +08:00
tiger_zhou
e82b8dc3d2 Merge remote-tracking branch 'origin/test-training2-zhouyin' into test-training2 2022-10-13 15:01:17 +08:00
tiger_zhou
70a2ff5fa8 理论试题管理代码调整 2022-10-13 15:00:52 +08:00
xzb
87d3fa57cb permission 2022-10-13 14:58:41 +08:00
xzb
8d3dc02b82 permission 2022-10-13 14:48:21 +08:00
xzb
7c5551f891 permission 2022-10-13 14:44:25 +08:00
xzb
92c25f77fd Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-10-13 14:22:39 +08:00
xzb
4977bc2e1d permission 2022-10-13 14:22:23 +08:00
tiger_zhou
7b491cf237 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-10-13 13:23:41 +08:00
tiger_zhou
5ebf8c63f5 理论试题管理代码调整 2022-10-13 13:23:29 +08:00
xzb
1611282abb paper 2022-10-13 11:26:32 +08:00
tiger_zhou
31dc5c283a 理论试题管理代码调整,合并管理接口 2022-10-13 11:15:46 +08:00
xzb
b94f1c5a03 new permission 2022-10-13 11:15:04 +08:00
xzb
dde2fb93c1 new permission 2022-10-13 10:05:36 +08:00
xzb
0eb6059f79 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-10-13 09:32:46 +08:00
xzb
3127ceaea1 new permission 2022-10-13 09:32:24 +08:00
weizhihong
c7c46228bc Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2 2022-10-12 18:08:13 +08:00