Commit Graph

2893 Commits

Author SHA1 Message Date
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
weizhihong
933a73d131 【去除项目前端唯一索引】 2022-10-17 15:01:41 +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