Commit Graph

3707 Commits

Author SHA1 Message Date
DU
c6f0df8b18 单位部门成员数据管理关联课程考试 2021-01-08 18:00:51 +08:00
fdd51383f4 Merge remote-tracking branch 'origin/test' into test 2021-01-08 15:32:06 +08:00
DU
8b64fde956 仿真会话bug修复 2021-01-07 19:33:01 +08:00
DU
61f2003f27 Merge remote-tracking branch 'origin/test' into test 2021-01-07 09:28:04 +08:00
DU
0ceee901a6 iscs加数据判断接口,车站实训生成背景更换,自动故障列车到达区段条件修改 2021-01-07 09:15:14 +08:00
39482d6b1d 苏电院屏蔽门调试 2021-01-05 17:47:55 +08:00
fa376fdfa3 Merge branch 'test' into restruct 2021-01-04 18:23:51 +08:00
c94ad846ce 仿真真实设备模拟逻辑开发 2021-01-04 18:22:14 +08:00
df1f83c789 Merge remote-tracking branch 'origin/test' into master-huawei 2020-12-31 18:23:58 +08:00
13cc8e9bf8 Merge remote-tracking branch 'origin/test' into test 2020-12-31 18:23:23 +08:00
50fb1fc564 仿真抽象 2020-12-31 18:22:58 +08:00
7fad4fd3ae Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/java/club/joylink/rtss/wechat/MiniProgramAccessTokenManager.java
#	src/main/java/club/joylink/rtss/wechat/MiniProgramServiceImpl.java
2020-12-31 18:21:41 +08:00
DU
d1e339a307 Merge remote-tracking branch 'origin/test' into test 2020-12-31 18:01:26 +08:00
DU
2434905228 实训适配新操作 2020-12-31 18:01:09 +08:00
f473304fe6 Merge remote-tracking branch 'origin/test' into test 2020-12-31 16:30:17 +08:00
32bb3e691e 控制模式判断bug修改 2020-12-31 16:30:02 +08:00
DU
2149d85ede Merge remote-tracking branch 'origin/test' into test 2020-12-31 13:45:22 +08:00
DU
55e2731634 试卷过期查询bug修改 2020-12-31 13:44:59 +08:00
0a53d304aa 导入导出添加ISCS数据 2020-12-31 09:53:03 +08:00
57c9fcc04f Merge remote-tracking branch 'origin/test' into test 2020-12-30 16:52:38 +08:00
eadc8ccc8c 删除用户配置表数据库相关对象和相关接口 2020-12-30 16:51:50 +08:00
a25e3dc6f2 Merge remote-tracking branch 'origin/test' into test 2020-12-30 16:18:02 +08:00
6cac955c4c 国赛场景添加权限控制 2020-12-30 16:17:51 +08:00
9aa83aab76 Merge remote-tracking branch 'origin/test' into master-huawei 2020-12-30 14:39:11 +08:00
9426e4ddeb 修改微信服务获取token接口调用 2020-12-30 14:38:51 +08:00
21406a1726 修改文件上传路径 2020-12-30 14:37:19 +08:00
4127d7d58b Merge remote-tracking branch 'origin/test' into test 2020-12-30 11:00:58 +08:00
d93934d9da 修改微信服务获取token接口调用 2020-12-30 11:00:27 +08:00
DU
ae12063980 试卷定义列表名称查询bug修改 2020-12-30 10:58:25 +08:00
7dd24fd938 Merge remote-tracking branch 'origin/test' into test 2020-12-30 10:42:52 +08:00
fc692f8040 运行图版本更新bug修改 2020-12-30 10:41:28 +08:00
DU
c9a0d8bc8f Merge remote-tracking branch 'origin/test' into test 2020-12-30 09:52:13 +08:00
DU
636432d6f9 复制运行计划bug修改 2020-12-30 09:51:11 +08:00
0bc894d2b9 Merge remote-tracking branch 'origin/test' into master-huawei 2020-12-30 09:18:32 +08:00
8161216321 Merge remote-tracking branch 'origin/test' into test 2020-12-30 09:17:37 +08:00
1745fcd5e0 修改邮件发送问题 2020-12-30 09:17:22 +08:00
DU
070dd06805 Merge remote-tracking branch 'origin/test' into test 2020-12-30 09:04:24 +08:00
2e2d58d992 Merge remote-tracking branch 'origin/test' into master-huawei 2020-12-29 18:39:20 +08:00
4628dc3fcb 修改小程序access_token获取 2020-12-29 18:37:29 +08:00
3d7fd9a5c2 抽象仿真,重构 2020-12-29 18:34:10 +08:00
07252b5fea 修改小程序access_token获取 2020-12-29 18:30:50 +08:00
DU
c9c4c20da9 修改运行图绘制bug 2020-12-29 18:19:59 +08:00
d50431919c ISCS复制接口修改 2020-12-29 17:08:43 +08:00
78e222b297 实训生成bug修改 2020-12-29 13:59:18 +08:00
a5326da09c Merge remote-tracking branch 'origin/test' into test 2020-12-29 10:31:40 +08:00
3b811d1d40 发布的ibp、iscs数据管理;ibp紧急停车bug修改 2020-12-29 10:31:24 +08:00
b4c3e458f0 Merge remote-tracking branch 'origin/test' into test 2020-12-28 14:33:56 +08:00
34fc686f4d 仿真列车出库时间调整为提前5分钟
列车折返进路办理添加是否存在冲突出库计划判断
2020-12-28 14:33:35 +08:00
7a45660493 Merge remote-tracking branch 'origin/test' into test 2020-12-28 13:58:20 +08:00
2fb256cf0e ibp紧急停车按钮逻辑 2020-12-28 13:58:00 +08:00