Commits · e0df8078490e6338043084ff5afc1ed983d38027 · ZTGK / hzsomms

18 Jul, 2023 6 commits
- 重新构造查询接口--shizhilong · e0df8078
  shizhilong authored Jul 18, 2023
  
  e0df8078
- Merge branch 'dev-szl' into 'dev' · 494af3c1
  史志龙 authored Jul 18, 2023
```
导入顺序问题 --shizhilong

See merge request !24
```
  494af3c1
- 导入顺序问题 --shizhilong · 8b34ffc6
  shizhilong authored Jul 18, 2023
  
  8b34ffc6
- Merge branch 'dev-hkl' into 'dev' · abcb0a49
  hkl authored Jul 18, 2023
```
Dev hkl

See merge request !23
```
  abcb0a49
- feat:1.单元编号划分 · fa272b0a
  hkl authored Jul 18, 2023
  
  fa272b0a
- feat:1.单元编号划分 · b8ad4197
  hkl authored Jul 18, 2023
  
  b8ad4197
17 Jul, 2023 7 commits
- Merge remote-tracking branch 'origin/dev' into dev-hkl · 98b0f4b0
  hkl authored Jul 17, 2023
  
  98b0f4b0
- Merge branch 'dev-szl' into 'dev' · d1b49a8b
  史志龙 authored Jul 17, 2023
```
添乘仪相关接口提交 --shizhilong

See merge request !22
```
  d1b49a8b
- 添乘仪相关接口提交 --shizhilong · 7c3c70fa
  shizhilong authored Jul 17, 2023
  
  7c3c70fa
- feat:1.单元编号划分 · e87bddc0
  hkl authored Jul 17, 2023
  
  e87bddc0
- feat:1.曲线管理bug修改 · 961cb187
  hkl authored Jul 17, 2023
  
  961cb187
- Merge branch 'dev-hkl' into 'dev' · 2661b491
  hkl authored Jul 17, 2023
```
Dev hkl

See merge request !21
```
  2661b491
- feat:1.检查数据-动静态几何尺寸数据-轨检仪静态检查数据 · 6f927bee
  hkl authored Jul 17, 2023
  
  6f927bee
16 Jul, 2023 2 commits
- feat:1.单元code生成 · d4767a76
  hkl authored Jul 16, 2023
  
  d4767a76
- feat:1.单元code生成 · 3345436c
  hkl authored Jul 16, 2023
  
  3345436c
15 Jul, 2023 5 commits
- Merge remote-tracking branch 'origin/dev' into dev-hkl · 5a069cfd
  hkl authored Jul 15, 2023
  
  5a069cfd
- Merge branch 'dev-szl' into 'dev' · 71dfd15e
  史志龙 authored Jul 15, 2023
```
初始化测点，维护测点 --shizhilong

See merge request !20
```
  71dfd15e
- 初始化测点，维护测点 --shizhilong · 9d238f70
  shizhilong authored Jul 15, 2023
  
  9d238f70
- Merge branch 'dev-szl' into 'dev' · 78239ed7
  史志龙 authored Jul 15, 2023
```
针对导入的数据进行排序页面查询返回 --shizhilong

See merge request !19
```
  78239ed7
- 针对导入的数据进行排序页面查询返回 --shizhilong · c6a0611a
  shizhilong authored Jul 15, 2023
  
  c6a0611a
14 Jul, 2023 6 commits
- Merge remote-tracking branch 'origin/dev' into dev-hkl · 65a3699b
  hkl authored Jul 14, 2023
  
  65a3699b
- Merge branch 'dev-szl' into 'dev' · e8061385
  史志龙 authored Jul 14, 2023
```
删除 --shizhilong

See merge request !18
```
  e8061385
- 删除 --shizhilong · 618c2ef3
  shizhilong authored Jul 14, 2023
  
  618c2ef3
- Merge branch 'dev-szl' into 'dev' · 5de3e3d7
  史志龙 authored Jul 14, 2023
```
Dev szl

See merge request !17
```
  5de3e3d7
- Merge remote-tracking branch 'origin/dev-szl' into dev-hkl · 7a5cb04d
  hkl authored Jul 14, 2023
  
  7a5cb04d
- 导入核心提交 --shizhilong · c5a6a405
  shizhilong authored Jul 14, 2023
  
  c5a6a405
13 Jul, 2023 4 commits
- Merge remote-tracking branch 'origin/dev-szl' into dev-hkl · 9efef569
  hkl authored Jul 13, 2023
  
  9efef569
- 导入 --shizhilong · 5c4f5aa8
  shizhilong authored Jul 13, 2023
  
  5c4f5aa8
- Merge remote-tracking branch 'origin/dev-szl' into dev-hkl · 34b837fe
  hkl authored Jul 13, 2023
  
  34b837fe
- 更新筛选条件 --shizhilong · 37e86dc0
  shizhilong authored Jul 13, 2023
  
  37e86dc0
12 Jul, 2023 10 commits
- Merge remote-tracking branch 'origin/dev' into dev-hkl · 4f7e4f2f
  hkl authored Jul 12, 2023
  
  4f7e4f2f
- 筛选数据条件更新提交 --shizhilong · 95de846b
  shizhilong authored Jul 12, 2023
  
  95de846b
- Merge branch 'dev' of http://gitlab.suntrayoa.com/ztgk/hzsomms into dev-szl · 3948b672
  shizhilong authored Jul 12, 2023
  
  3948b672
- 更改道床排序 --shizhilong · 51fde650
  shizhilong authored Jul 10, 2023
  
  51fde650
- 增加注释 --shizhilong · 6fa55b0e
  shizhilong authored Jul 08, 2023
  
  6fa55b0e
- Merge remote-tracking branch 'origin/dev-szl' into dev · 346944ca
  hkl authored Jul 12, 2023
  
  346944ca
- Merge remote-tracking branch 'origin/dev-hkl' into dev · 30714c53
  hkl authored Jul 12, 2023
  
  30714c53
- feat:1.更新线路管理,2.数据检查管理 · 5a724cbe
  hkl authored Jul 12, 2023
  
  5a724cbe
- Merge branch 'dev' of http://gitlab.suntrayoa.com/ztgk/hzsomms into dev-szl · 49732993
  shizhilong authored Jul 12, 2023
  
  49732993
- 动静态几何数据提交 --shizhilong · 355f90b7
  shizhilong authored Jul 12, 2023
  
  355f90b7