Commit Graph

2843 Commits

Author SHA1 Message Date
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
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
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