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 |
|
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 |
|
weizhihong
|
1089d2d410
|
【项目信息编辑】
|
2022-10-12 18:08:07 +08:00 |
|
xzb
|
d64117292a
|
paper
|
2022-10-12 17:44:11 +08:00 |
|
xzb
|
fabaff59fb
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-10-12 17:27:02 +08:00 |
|
weizhihong
|
9d070b43d5
|
【登录角色列表设置】
|
2022-10-12 17:21:06 +08:00 |
|
weizhihong
|
02e8ce4d9e
|
【解决登录时获取项目列表BUG】
|
2022-10-12 17:18:25 +08:00 |
|
weizhihong
|
d3ad9c958f
|
【登录选择组织列表逻辑，文件名称模糊搜索】
|
2022-10-12 17:06:57 +08:00 |
|
tiger_zhou
|
ab9275384b
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-10-12 16:54:25 +08:00 |
|
tiger_zhou
|
3de220bc62
|
理论试题管理修改表明添加“rts_”前缀
|
2022-10-12 16:52:53 +08:00 |
|
weizhihong
|
8c9c9eb0c0
|
【项目快捷创建组织接口】
|
2022-10-12 15:49:26 +08:00 |
|
weizhihong
|
1973bf3f24
|
【查询项目关联组织时，过滤多余字段】
|
2022-10-12 14:24:02 +08:00 |
|
weizhihong
|
ee8ad73e87
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
|
2022-10-12 14:12:07 +08:00 |
|
weizhihong
|
2745d4950b
|
【项目增加默认组织字段，去除前端选择项目字段】
|
2022-10-12 14:11:58 +08:00 |
|
tiger_zhou
|
5376d3deb5
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-10-12 14:10:26 +08:00 |
|
xzb
|
89830befb4
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-10-12 10:41:21 +08:00 |
|
xzb
|
25fcd4e000
|
paper
|
2022-10-12 10:41:01 +08:00 |
|
|
|
820ea94b26
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
# Conflicts:
# src/main/resources/application.yml
|
2022-10-11 13:08:26 +08:00 |
|
|
|
a7b09745c3
|
新仿真结构完善中
|
2022-10-11 13:06:51 +08:00 |
|
tiger_zhou
|
8693449f85
|
理论试题管理代码调整
|
2022-10-11 10:03:39 +08:00 |
|
weizhihong
|
dfdf038d7e
|
【MINIO资源是否存在接口】
|
2022-10-11 09:53:30 +08:00 |
|
tiger_zhou
|
2112334492
|
理论试题管理代码调整
|
2022-10-11 09:19:38 +08:00 |
|
tiger_zhou
|
1e379c7e93
|
监管仿真接口
|
2022-10-11 09:18:14 +08:00 |
|
tiger_zhou
|
3bf5996bee
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-10-11 08:48:05 +08:00 |
|
weizhihong
|
53e90f652c
|
【MINIO连接程序替换http->https】
|
2022-10-10 17:04:01 +08:00 |
|
tiger_zhou
|
9e8ad48284
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-10-10 15:39:03 +08:00 |
|
|
|
3264befe0a
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-10-10 13:22:31 +08:00 |
|
|
|
821c31c446
|
仿真结构调整
|
2022-10-10 13:22:18 +08:00 |
|
weizhihong
|
13d2ac11dc
|
【minio链接修改为https】
|
2022-10-10 10:56:08 +08:00 |
|
xzb
|
122badc463
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-10-10 10:26:43 +08:00 |
|
xzb
|
575c58c739
|
paper
|
2022-10-10 10:26:13 +08:00 |
|
tiger_zhou
|
543584828e
|
mybatis 查询数据封装对象支持"驼峰"规范
|
2022-10-10 09:28:09 +08:00 |
|
tiger_zhou
|
5bb5c07031
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-10-10 08:52:08 +08:00 |
|
weizhihong
|
271e44e9b2
|
【本地配置修改为http】
|
2022-10-09 18:30:32 +08:00 |
|
weizhihong
|
4509440175
|
【配置文件提交】
|
2022-10-09 18:21:01 +08:00 |
|
xzb
|
ceadaccb3b
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-10-09 18:03:48 +08:00 |
|
xzb
|
be1dc7de2e
|
paper
|
2022-10-09 18:03:24 +08:00 |
|
tiger_zhou
|
1e18878c67
|
已发布实训添加查询维度(名称，地图，类型，标签及组织)
|
2022-10-09 16:09:12 +08:00 |
|
weizhihong
|
16b035d43b
|
【设备管理中项目Code修改为前端指定】
|
2022-10-09 15:14:12 +08:00 |
|
