Commits · 6bccb055c74d1b949aa42afc9defbb987ac90f23 · ZTGK / hzsomms

21 Jul, 2023 7 commits
- Merge remote-tracking branch 'origin/dev' into dev · 6bccb055
  shizhilong authored Jul 21, 2023
  
  6bccb055
- Merge branch 'dev-szl' into 'dev' · 8c78a6b2
  史志龙 authored Jul 21, 2023
```
解决bug部分--shizhilong

See merge request !29
```
  8c78a6b2
- 解决bug部分--shizhilong · 14f3e481
  shizhilong authored Jul 21, 2023
  
  14f3e481
- Merge remote-tracking branch 'origin/dev' into dev · 472421bd
  shizhilong authored Jul 21, 2023
  
  472421bd
- Merge branch 'dev-hkl' into 'dev' · ce200d49
  hkl authored Jul 21, 2023
```
Dev hkl

See merge request !28
```
  ce200d49
- feat:1.提交树 · f14bbfff
  hkl authored Jul 21, 2023
  
  f14bbfff
- Merge remote-tracking branch 'origin/dev' into dev · fa229a1e
  shizhilong authored Jul 21, 2023
  
  fa229a1e
20 Jul, 2023 1 commit
- feat:1.提交更新数据 · 8fe6203a
  hkl authored Jul 20, 2023
  
  8fe6203a
18 Jul, 2023 15 commits
- Merge branch 'dev-hkl' into 'dev' · a263cc96
  hkl authored Jul 18, 2023
```
feat:1.单元编号划分

See merge request !26
```
  a263cc96
- feat:1.提交轨检仪数据 · d53815de
  hkl authored Jul 18, 2023
  
  d53815de
- Merge remote-tracking branch 'origin/dev' into dev · 9645188a
  shizhilong authored Jul 18, 2023
  
  9645188a
- Merge remote-tracking branch 'origin/dev' into dev-hkl · 2b3b479f
  hkl authored Jul 18, 2023
  
  2b3b479f
- Merge branch 'dev-szl' into 'dev' · 00ee3c3e
  史志龙 authored Jul 18, 2023
```
重新构造查询接口--shizhilong

See merge request !25
```
  00ee3c3e
- 重新构造查询接口--shizhilong · e0df8078
  shizhilong authored Jul 18, 2023
  
  e0df8078
- Merge remote-tracking branch 'origin/dev' into dev-hkl · 8044aa52
  hkl authored Jul 18, 2023
  
  8044aa52
- Merge remote-tracking branch 'origin/dev' into dev · f5b1b434
  shizhilong authored Jul 18, 2023
  
  f5b1b434
- Merge branch 'dev-szl' into 'dev' · 494af3c1
  史志龙 authored Jul 18, 2023
```
导入顺序问题 --shizhilong

See merge request !24
```
  494af3c1
- Merge remote-tracking branch 'origin/dev' into dev · 893049fd
  shizhilong authored Jul 18, 2023
  
  893049fd
- 导入顺序问题 --shizhilong · 8b34ffc6
  shizhilong authored Jul 18, 2023
  
  8b34ffc6
- feat:1.单元编号划分 · 13e46443
  hkl authored Jul 18, 2023
  
  13e46443
- 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 9 commits
- Merge remote-tracking branch 'origin/dev' into dev-hkl · 98b0f4b0
  hkl authored Jul 17, 2023
  
  98b0f4b0
- Merge remote-tracking branch 'origin/dev' into dev · 80b57dfc
  shizhilong authored Jul 17, 2023
  
  80b57dfc
- 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 remote-tracking branch 'origin/dev' into dev · a1b1d3e9
  shizhilong authored Jul 17, 2023
  
  a1b1d3e9
- 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 6 commits
- Merge remote-tracking branch 'origin/dev' into dev-hkl · 5a069cfd
  hkl authored Jul 15, 2023
  
  5a069cfd
- Merge remote-tracking branch 'origin/dev' into dev · 11f75b70
  shizhilong authored Jul 15, 2023
  
  11f75b70
- 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 remote-tracking branch 'origin/dev' into dev · 5eb0aff9
  shizhilong authored Jul 15, 2023
  
  5eb0aff9
- Merge branch 'dev-szl' into 'dev' · 78239ed7
  史志龙 authored Jul 15, 2023
```
针对导入的数据进行排序页面查询返回 --shizhilong

See merge request !19
```
  78239ed7