Commits · 65a3699b2284cd3f852391faa7efdc4f2df9abaf · ZTGK / hzsomms

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 11 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
- 动静态几何数据提交 --shizhilong · aaf73f02
  shizhilong authored Jul 12, 2023
  
  aaf73f02
11 Jul, 2023 8 commits
- Merge remote-tracking branch 'origin/dev-hkl' into dev · c9e9e694
  hkl authored Jul 11, 2023
  
  c9e9e694
- feat:1.更新线路管理 · c33bd4ed
  hkl authored Jul 11, 2023
  
  c33bd4ed
- Merge remote-tracking branch 'origin/dev-hkl' into dev · 4ea74578
  hkl authored Jul 11, 2023
  
  4ea74578
- feat:1.更新线路管理 · edb54975
  hkl authored Jul 11, 2023
  
  edb54975
- Merge branch 'dev-hkl' into 'dev' · 104acff8
  hkl authored Jul 11, 2023
```
Dev hkl

See merge request !16
```
  104acff8
- feat:1.更新线路管理 · 43c28f48
  hkl authored Jul 11, 2023
  
  43c28f48
- feat:1.更新线路管理 · 3fae48b1
  hkl authored Jul 11, 2023
  
  3fae48b1
- feat:1.更新线路管理 · 1b7860ed
  hkl authored Jul 11, 2023
  
  1b7860ed
10 Jul, 2023 5 commits
- 更改道床排序 --shizhilong · b8edc99d
  shizhilong authored Jul 10, 2023
  
  b8edc99d
- Merge remote-tracking branch 'origin/dev-szl' into dev-szl · 09f61c8e
  shizhilong authored Jul 10, 2023
  
  09f61c8e
- Merge branch 'dev' into 'dev-szl' · 0ed974ef
  hkl authored Jul 10, 2023
```
Dev

See merge request !11
```
  0ed974ef
- Merge branch 'dev' of http://gitlab.suntrayoa.com/ztgk/hzsomms into dev-szl · 8b56f801
  shizhilong authored Jul 10, 2023
  
  8b56f801
- Merge branch 'dev-hkl' into 'dev' · b234eb1b
  hkl authored Jul 10, 2023
```
Dev hkl

See merge request !10
```
  b234eb1b
09 Jul, 2023 6 commits
- Merge remote-tracking branch 'origin/dev-hkl' into dev-hkl · e646b49b
  hkl authored Jul 09, 2023
  
  e646b49b
- feat:1.检查数据-设备检查记录数据-曲线磨耗情况检查 · b970ea93
  hkl authored Jul 09, 2023
  
  b970ea93
- feat:1.检查数据-设备检查记录数据-钢轨伤损情况检查表 · 3e7af45b
  hkl authored Jul 09, 2023
  
  3e7af45b
- feat:1.道岔使用情况检查业务 · ca58b9f8
  hkl authored Jul 09, 2023
  
  ca58b9f8
- feat:1.道岔使用情况检查业务 · 989a7497
  hkl authored Jul 09, 2023
  
  989a7497
- feat:1.提交pom文件 · 4a519ec2
  hkl authored Jul 08, 2023
  
  4a519ec2