Commit Graph

2955 Commits

Author SHA1 Message Date
tiger_zhou
480553625e Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-09-29 17:48:07 +08:00
tiger_zhou
21928877d8 语音识别,合成重构, 2022-09-29 17:47:48 +08:00
xzb
9b94c39826 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-09-29 17:36:33 +08:00
xzb
5c647108a7 paper composition rule 2022-09-29 17:36:05 +08:00
88434943e2 Merge remote-tracking branch 'origin/test-training2' into test-training2 2022-09-29 16:50:34 +08:00
55f0856010 删除无用消息类型 2022-09-29 16:50:15 +08:00
weizhihong
c6abb97709 【添加项目View BUG】 2022-09-29 16:42:28 +08:00
tiger_zhou
db0222843f Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-09-29 16:34:14 +08:00
weizhihong
794a86e690 【组织实体对象】 2022-09-29 16:32:53 +08:00
weizhihong
9e70e4d223 【登录时组织信息】 2022-09-29 16:31:52 +08:00
weizhihong
fde7baef6d 【空指针问题解决】 2022-09-29 16:30:33 +08:00
weizhihong
e82075281c 【增加项目信息】 2022-09-29 16:29:23 +08:00
weizhihong
a6470891a4 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2 2022-09-29 16:22:55 +08:00
weizhihong
5a7092360a 【增加顶级组织ID方法】 2022-09-29 16:22:46 +08:00
tiger_zhou
4f138401db Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-09-29 15:57:05 +08:00
435758678c 注释闸机状态代码 2022-09-29 15:10:42 +08:00
23d116c060 删除废代码 2022-09-29 15:08:40 +08:00
xzb
a6778a0a58 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-09-29 14:46:06 +08:00
xzb
b2adc808e3 paper 2022-09-29 14:45:41 +08:00
8ab5cf63f8 修改iscs消息发布的路径选择bug 2022-09-29 14:09:40 +08:00
weizhihong
c40ce1e2dd 【 项目查询增加名称、code筛选参数】 2022-09-29 10:26:35 +08:00
tiger_zhou
9dc4a55d17 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-09-29 09:00:18 +08:00
xzb
80b3106cfa Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-09-28 18:02:21 +08:00
xzb
5b8e0049e4 paper 2022-09-28 18:01:55 +08:00
d1f6e14f42 增加从仿真中获取iscs状态逻辑;增加闸机设备 2022-09-28 17:44:26 +08:00
weizhihong
d6f7618ba9 【项目查询列表全数据查询】 2022-09-28 17:36:36 +08:00
weizhihong
7b2e488882 [项目修改BUG] 2022-09-28 17:26:48 +08:00
weizhihong
bf4bad87b1 【项目描述字段调整】 2022-09-28 16:42:11 +08:00
xzb
ac5c1ed33d Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-09-28 16:34:09 +08:00
xzb
65f46b48d4 paper 2022-09-28 16:33:52 +08:00
weizhihong
63f23cf14e Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2 2022-09-28 16:32:58 +08:00
weizhihong
bfbfcf4b3e 【项目结构调整,MINIO增加客户端管理服务类,项目project表结构变更sql】 2022-09-28 16:32:52 +08:00
xzb
29d9d76e7d paper company id 2022-09-28 15:36:48 +08:00
xzb
69014b0c71 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-xzb1 2022-09-28 14:49:45 +08:00
xzb
b2086a4c81 paper 2022-09-28 14:49:24 +08:00
tiger_zhou
87de6cb800 语音识别,合成重构 2022-09-28 13:57:32 +08:00
weizhihong
42eaa75d65 【minio工具类增加全路径查询文件,修改返回值类型】 2022-09-28 13:37:10 +08:00
weizhihong
2e44fce9f4 【项目信息编辑属性修改】 2022-09-28 09:58:56 +08:00
weizhihong
cb6b6e6516 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2 2022-09-28 09:42:07 +08:00
weizhihong
6637a945fa 【minio 上传文件】 2022-09-28 09:42:01 +08:00
f5f6188ff5 修改PIS发布消息bug 2022-09-28 09:05:38 +08:00
xzb
4301c32b49 paper 2022-09-27 18:01:48 +08:00
xzb
91e23d36ae paper 2022-09-27 17:59:16 +08:00
tiger_zhou
6d2faad0ae 理论试题管理代码调整 2022-09-27 15:33:47 +08:00
tiger_zhou
f28d92f793 Merge remote-tracking branch 'origin/test-training2-zhouyin' into test-training2
# Conflicts:
#	src/main/java/club/joylink/rtss/dao/paper/PaperQuestionDAO.java
#	src/main/java/club/joylink/rtss/entity/paper/question/PaperQuestion.java
2022-09-27 15:29:35 +08:00
tiger_zhou
66bf5f7549 理论试题管理代码调整 2022-09-27 15:28:57 +08:00
xzb
9fe24f7230 paper 2022-09-27 15:27:03 +08:00
xzb
7ae3346ad7 paper 2022-09-27 15:13:21 +08:00
tiger_zhou
ff172cf784 Merge branch 'test-training2' of https://git.code.tencent.com/lian-cbtc/rtss-server into test-training2-zhouyin 2022-09-27 15:12:22 +08:00
xzb
7b6ab5608e paper 2022-09-27 15:11:03 +08:00