tiger_zhou
|
e8d0207e49
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-10-26 15:55:09 +08:00 |
|
tiger_zhou
|
ebf3377cc1
|
用户权限修改status数据类型,用户权限查询过滤,试卷标签筛选从 or 变更为 and
|
2022-10-26 15:54:56 +08:00 |
|
weizhihong
|
f847b306f4
|
【步骤增加仿真操作属性】
【修改实训运行逻辑】
|
2022-10-26 14:18:24 +08:00 |
|
tiger_zhou
|
d05ce9ccef
|
权限分发,查询调整
|
2022-10-26 14:07:59 +08:00 |
|
tiger_zhou
|
4a8f71ad1e
|
新(支持前端多个权限)权限分发,目前接口不支持二次分发
|
2022-10-26 10:49:00 +08:00 |
|
|
4252c56961
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-10-26 09:34:00 +08:00 |
|
|
6e6e3f7114
|
增加第三方账户配置接口;修改地图数据导入bug
|
2022-10-26 09:33:47 +08:00 |
|
weizhihong
|
746cea77b4
|
【生成实训规则实体】
|
2022-10-25 15:17:52 +08:00 |
|
weizhihong
|
7442082a7a
|
【空指针BUG】
|
2022-10-25 14:01:25 +08:00 |
|
weizhihong
|
6a7d89bfe5
|
【修改表名】
|
2022-10-25 13:31:42 +08:00 |
|
xiazengbin
|
ec09da1efc
|
permission
|
2022-10-25 13:12:15 +08:00 |
|
xiazengbin
|
150e4dc1b5
|
permission
|
2022-10-25 12:37:30 +08:00 |
|
|
9114da604b
|
仿真信息接口增加仿真工作参数;地图复制接口修改
|
2022-10-25 10:46:13 +08:00 |
|
|
0f506ce2ad
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-10-25 09:19:35 +08:00 |
|
|
6627018a02
|
注释掉大客流的监听器(行调工作站按计划行车报错)
|
2022-10-25 09:19:16 +08:00 |
|
tiger_zhou
|
a3d0545da1
|
试卷筛选出现没有选择类型的题目
|
2022-10-24 17:57:56 +08:00 |
|
|
1e3475bb62
|
修改导入/导出接口
|
2022-10-24 17:02:32 +08:00 |
|
tiger_zhou
|
6fcbf24d13
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-10-24 16:45:02 +08:00 |
|
tiger_zhou
|
c8a77c9034
|
权限功能提供列表接口
|
2022-10-24 16:44:48 +08:00 |
|
weizhihong
|
c2c31ce3b3
|
【地图数据所属项目为空时,处理默认项目】
|
2022-10-24 15:36:10 +08:00 |
|
weizhihong
|
b0330e85cf
|
【登录时,处理用户项目列表】
|
2022-10-24 14:45:56 +08:00 |
|
tiger_zhou
|
616d8898b4
|
权限功能注释不必要的接口
|
2022-10-24 13:52:41 +08:00 |
|
tiger_zhou
|
7880ced128
|
答题试卷可以重复答题,并且修改的时候返回上次答题的答案
|
2022-10-24 10:12:46 +08:00 |
|
tiger_zhou
|
231171b6c8
|
用户权限支持查看已很配领取的权限,答题试卷在创建的时候及有开始时间
|
2022-10-21 17:14:56 +08:00 |
|
tiger_zhou
|
e398d0c364
|
用户权限禁用接口调整
|
2022-10-21 14:31:53 +08:00 |
|
tiger_zhou
|
16276f80f7
|
用户权限禁用接口调整
|
2022-10-21 14:30:52 +08:00 |
|
tiger_zhou
|
78e91eb573
|
权限查询支持昵称及功能列表,用户权限禁用接口调整
|
2022-10-21 14:30:20 +08:00 |
|
tiger_zhou
|
f0a420311c
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-10-21 11:03:09 +08:00 |
|
tiger_zhou
|
688654d7d4
|
语音识别调整
|
2022-10-21 11:02:55 +08:00 |
|
weizhihong
|
d94039c8bb
|
【MINIO删除对象方法】
|
2022-10-21 09:43:15 +08:00 |
|
tiger_zhou
|
6b6fd85cc6
|
权限功能调整
|
2022-10-20 18:03:12 +08:00 |
|
tiger_zhou
|
e52ffe07a8
|
权限功能调整
|
2022-10-20 18:01:02 +08:00 |
|
tiger_zhou
|
4f0a10bb6d
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-10-20 17:27:10 +08:00 |
|
tiger_zhou
|
17fb69073e
|
权限功能调整
|
2022-10-20 17:26:54 +08:00 |
|
tiger_zhou
|
b5c186aa13
|
权限功能调整
|
2022-10-20 15:23:20 +08:00 |
|
|
47ec3e5ecc
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-10-20 15:12:16 +08:00 |
|
|
1ae745b377
|
增加新的根据用户信息查询地图接口
|
2022-10-20 15:12:00 +08:00 |
|
tiger_zhou
|
b838e4dd3c
|
应急预警调整
|
2022-10-20 14:50:45 +08:00 |
|
tiger_zhou
|
1101841879
|
权限功能调整
|
2022-10-20 14:25:52 +08:00 |
|
tiger_zhou
|
8d74d09d80
|
权限功能调整
|
2022-10-20 13:52:00 +08:00 |
|
tiger_zhou
|
d142179cb7
|
权限功能调整
|
2022-10-20 13:45:09 +08:00 |
|
tiger_zhou
|
81c4db28a7
|
权限功能调整
|
2022-10-20 13:39:05 +08:00 |
|
tiger_zhou
|
ad319c094e
|
权限功能调整
|
2022-10-20 13:37:12 +08:00 |
|
tiger_zhou
|
0b04b23537
|
权限功能调整及权限主体禁用功能(未完成)
|
2022-10-20 13:33:58 +08:00 |
|
tiger_zhou
|
f9b02894e0
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-10-20 09:54:07 +08:00 |
|
tiger_zhou
|
484ff18eed
|
理论试题管理代码调整支持清空
|
2022-10-20 09:52:36 +08:00 |
|
tiger_zhou
|
1f63bd48e2
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
|
2022-10-20 09:27:18 +08:00 |
|
xzb
|
a20a57b5c0
|
修改试卷定义时间判断
|
2022-10-20 09:24:31 +08:00 |
|
xzb
|
d29a869c26
|
permission
|
2022-10-19 17:47:42 +08:00 |
|
xzb
|
4b43640085
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-10-19 17:07:34 +08:00 |
|
xzb
|
677f9ab163
|
permission
|
2022-10-19 17:07:16 +08:00 |
|
weizhihong
|
5ad0bec6ba
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
|
2022-10-19 16:49:36 +08:00 |
|
weizhihong
|
73f73a426e
|
【删除登录信息中所有的组织信息】
|
2022-10-19 16:49:29 +08:00 |
|
xzb
|
315e956927
|
permission
|
2022-10-19 16:46:36 +08:00 |
|
tiger_zhou
|
d37b10f207
|
应急系统添加速度及调整
|
2022-10-19 16:06:13 +08:00 |
|
tiger_zhou
|
e14286f329
|
应急系统添加速度及调整
|
2022-10-19 15:59:51 +08:00 |
|
xzb
|
074f49a2a9
|
permission
|
2022-10-19 15:59:19 +08:00 |
|
xzb
|
3c4a678db0
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-10-19 15:59:00 +08:00 |
|
xzb
|
9c12891135
|
permission
|
2022-10-19 15:58:36 +08:00 |
|
tiger_zhou
|
4201b1165d
|
应急系统添加速度及调整
|
2022-10-19 15:53:41 +08:00 |
|
tiger_zhou
|
1b7e46d5c7
|
权限主体
|
2022-10-19 15:49:36 +08:00 |
|
|
e9e45d5cb6
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-10-19 15:41:03 +08:00 |
|
|
72b4ac8fd5
|
修改生成子系统逻辑
|
2022-10-19 15:40:39 +08:00 |
|
xzb
|
6135e912f2
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-10-19 15:02:50 +08:00 |
|
xzb
|
9a0d0d2980
|
permission
|
2022-10-19 15:02:33 +08:00 |
|
tiger_zhou
|
66ac5d7b02
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-10-19 14:00:51 +08:00 |
|
tiger_zhou
|
1680097d72
|
新权限分发及题库代码调整
|
2022-10-19 14:00:07 +08:00 |
|
xzb
|
ebe85d7c26
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-10-19 13:55:30 +08:00 |
|
xzb
|
7de63057a3
|
permission
|
2022-10-19 13:55:13 +08:00 |
|
tiger_zhou
|
d454a2a51c
|
新权限分发代码调整
|
2022-10-19 13:39:25 +08:00 |
|
tiger_zhou
|
4c1ce8e593
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin
Conflicts:
src/main/java/club/joylink/rtss/entity/permission/PermissionDistribute.java
src/main/java/club/joylink/rtss/entity/permission/PermissionDistributeExample.java
src/main/resources/mybatis/mapper/permission/PermissionSubjectDAO.xml
|
2022-10-19 13:35:37 +08:00 |
|
|
ef389ca8f4
|
导入导出增加运行图交路数据
|
2022-10-19 13:34:23 +08:00 |
|
tiger_zhou
|
c2dbbbb715
|
应急系统添加速度及调整
|
2022-10-19 13:25:25 +08:00 |
|
|
5a3179df5a
|
修改新仿真创建接口参数;修改生成子系统接口(未完)
|
2022-10-19 11:16:22 +08:00 |
|
xzb
|
b7a25fb070
|
permission
|
2022-10-19 11:09:44 +08:00 |
|
xzb
|
3eae7d7672
|
permission
|
2022-10-19 10:06:03 +08:00 |
|
xzb
|
ec4509d7ef
|
permission
|
2022-10-19 10:04:21 +08:00 |
|
xzb
|
6c36d6f753
|
permission
|
2022-10-19 09:54:56 +08:00 |
|
xzb
|
54c73004d9
|
permission
|
2022-10-19 09:49:38 +08:00 |
|
weizhihong
|
d0d517450f
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2
|
2022-10-19 08:53:09 +08:00 |
|
weizhihong
|
afc62e8f4e
|
【修改顶级组织ID获取逻辑】
|
2022-10-19 08:53:03 +08:00 |
|
xzb
|
f81041afa1
|
permission
|
2022-10-18 17:45:34 +08:00 |
|
xzb
|
0d758f8ca5
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-10-18 17:41:20 +08:00 |
|
xzb
|
14ad0dfce5
|
permission
|
2022-10-18 17:40:56 +08:00 |
|
weizhihong
|
853dd2fe35
|
【修改查询班级时,获取组织逻辑】
|
2022-10-18 15:27:26 +08:00 |
|
|
a652d06bb6
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
# Conflicts:
# src/main/java/club/joylink/rtss/services/draftData/DraftMapDisStationService.java
|
2022-10-18 14:21:23 +08:00 |
|
|
3a5fbb16e9
|
增加生成子系统的接口;增加仿真客户端类型;
|
2022-10-18 14:19:40 +08:00 |
|
xzb
|
df6e9fd578
|
permission
|
2022-10-18 13:50:29 +08:00 |
|
xzb
|
0a752feb47
|
permission
|
2022-10-18 13:19:15 +08:00 |
|
xzb
|
24dd1cead9
|
permission
|
2022-10-18 13:08:19 +08:00 |
|
xzb
|
b40ccfe775
|
permission
|
2022-10-18 10:29:05 +08:00 |
|
xzb
|
013b58f6bd
|
page
|
2022-10-18 09:52:42 +08:00 |
|
xzb
|
fe9333fbb5
|
permission
|
2022-10-18 09:43:55 +08:00 |
|
xzb
|
a912a25c51
|
permission
|
2022-10-18 09:38:54 +08:00 |
|
tiger_zhou
|
c8a8bdc6ee
|
新权限分发领取功能
|
2022-10-18 09:27:16 +08:00 |
|
xzb
|
0e34851966
|
paper
|
2022-10-17 17:07:42 +08:00 |
|
xzb
|
5310fc7819
|
paper
|
2022-10-17 16:28:46 +08:00 |
|
xzb
|
522d446516
|
paper
|
2022-10-17 16:13:16 +08:00 |
|
xzb
|
44e1c38a74
|
Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1
|
2022-10-17 16:04:33 +08:00 |
|
xzb
|
d869ce06da
|
paper
|
2022-10-17 16:04:16 +08:00 |
|
|
761d7e353b
|
Merge remote-tracking branch 'origin/test-training2' into test-training2
|
2022-10-17 14:52:45 +08:00 |
|
|
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 |
|
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 |
|
tiger_zhou
|
e84b9ad0dc
|
应急预警系统-语音指令功能
|
2022-10-12 14:08:53 +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 |
|