提交 · 52d2c5a84c5c097bcfe9c220b2dfcb17ce21362c · 姜武杰 / clx-performance · GitLab

13 8月, 2024 40 次提交
- Merge branch 'refs/heads/v20.9_settlement_20240805' into test · 52d2c5a8
  由艾庆国提交于 8月 13, 2024
```
Former-commit-id: 1d46ca68
```
  52d2c5a8
- 承运结算单优化-代码优化 · 89c67bc5
  由艾庆国提交于 8月 13, 2024
  
  89c67bc5
- Merge branch 'refs/heads/v20.9_settlement_20240805' into test · ccf4eef1
  由艾庆国提交于 8月 13, 2024
```
Former-commit-id: 291ee366
```
  ccf4eef1
- 承运结算单优化-代码优化 · 86f11358
  由艾庆国提交于 8月 13, 2024
  
  86f11358
- Merge remote-tracking branch 'origin/test' into test · 2aae90fc
  由杨启发提交于 8月 13, 2024
```
Former-commit-id: f19054fd
```
  2aae90fc
- Merge branch 'refs/heads/v20.9_settlement_20240805' into test · ddf657fe
  由杨启发提交于 8月 13, 2024
```
Former-commit-id: d6dba23e
```
  ddf657fe
- Merge branch 'refs/heads/v20.9_settlement_20240805' into test · 88d38fa9
  由艾庆国提交于 8月 13, 2024
```
Former-commit-id: cff7f713
```
  88d38fa9
- 承运结算单优化-代码优化 · 6bd78df3
  由艾庆国提交于 8月 13, 2024
  
  6bd78df3
- Merge remote-tracking branch 'origin/v20.9_settlement_20240805' into v20.9_settlement_20240805 · 028fadbe
  由杨启发提交于 8月 13, 2024
  
  028fadbe
- 结算单优化 · b67ab8db
  由杨启发提交于 8月 13, 2024
  
  b67ab8db
- Merge branch 'refs/heads/v20.9_settlement_20240805' into test · 4d16bc91
  由艾庆国提交于 8月 13, 2024
```
Former-commit-id: 145752df
```
  4d16bc91
- 承运结算单优化-代码优化 · 63afad3a
  由艾庆国提交于 8月 13, 2024
  
  63afad3a
- Merge branch 'refs/heads/v20.9_settlement_20240805' into test · 4e5a7b70
  由艾庆国提交于 8月 13, 2024
```
Former-commit-id: 139eaad5
```
  4e5a7b70
- 承运结算单优化-代码优化 · 8fc17431
  由艾庆国提交于 8月 13, 2024
  
  8fc17431
- Merge branch 'refs/heads/v20.9_settlement_20240805' into test · ffd2e405
  由艾庆国提交于 8月 13, 2024
```
Former-commit-id: c65f0acc
```
  ffd2e405
- Merge remote-tracking branch 'origin/test' into test · e6cb8783
  由 jiangwujie 提交于 8月 13, 2024
```
Former-commit-id: 57882307
```
  e6cb8783
- 承运结算单优化-代码优化 · e2595d86
  由艾庆国提交于 8月 13, 2024
  
  e2595d86
- Merge branch 'v21.1_jianzhuang_20240807' into test · d4c9b716
  由 jiangwujie 提交于 8月 13, 2024
```
Former-commit-id: df0abcfe
```
  d4c9b716
- Merge branch 'refs/heads/v20.9_settlement_20240805' into test · ff98d2ab
  由艾庆国提交于 8月 13, 2024
```
Former-commit-id: fc13d204
```
  ff98d2ab
- 承运结算单优化-代码优化 · 0744b029
  由艾庆国提交于 8月 13, 2024
  
  0744b029
- feature(电子围栏): 如果从中交兴路无法获取数据，则从trace中获取卡车或者司机的位置来进行判断 · 48b62e2e
  由 jiangwujie 提交于 8月 13, 2024
  
  48b62e2e
- Merge remote-tracking branch 'origin/test' into test · 01ece61b
  由刘海泉提交于 8月 13, 2024
```
Former-commit-id: a899c0ee
```
  01ece61b
- Merge remote-tracking branch 'origin/v20.8_add_sub_weight_20240805' into test · cd22568e
  由刘海泉提交于 8月 13, 2024
```
Former-commit-id: b1cb7876
```
  cd22568e
- 修改获取可提取吨数方法的逻辑计算 · d73c7767
  由刘海泉提交于 8月 13, 2024
  
  d73c7767
- Merge branch 'refs/heads/v20.9_settlement_20240805' into test · 3b29b6c7
  由艾庆国提交于 8月 13, 2024
```
Former-commit-id: e27e4f79
```
  3b29b6c7
- 承运结算单优化-代码优化 · 81dc7ecb
  由艾庆国提交于 8月 13, 2024
  
  81dc7ecb
- 承运结算单优化-代码优化 · e094a4d2
  由艾庆国提交于 8月 13, 2024
  
  e094a4d2
- Merge branch 'refs/heads/v20.9_settlement_20240805' into test · 3565bc56
  由艾庆国提交于 8月 13, 2024
```
Former-commit-id: bacbf692
```
  3565bc56
- 承运结算单优化-代码优化 · 569c737a
  由艾庆国提交于 8月 13, 2024
  
  569c737a
- 修改获取可提取吨数方法的逻辑计算 · de7b8313
  由刘海泉提交于 8月 13, 2024
  
  de7b8313
- Merge branch 'refs/heads/v20.9_settlement_20240805' into test · 04bb6a5d
  由艾庆国提交于 8月 13, 2024
```
Former-commit-id: a9161e92
```
  04bb6a5d
- 承运结算单优化-修改枚举定义 · beffecda
  由艾庆国提交于 8月 13, 2024
  
  beffecda
- Merge branch 'refs/heads/v20.9_settlement_20240805' into test · 204f205c
  由艾庆国提交于 8月 13, 2024
```
Former-commit-id: dd0a5cd1
```
  204f205c
- 承运结算单优化-修改枚举定义 · db8d23e8
  由艾庆国提交于 8月 13, 2024
  
  db8d23e8
- Merge remote-tracking branch 'origin/test' into test · 88625651
  由刘海泉提交于 8月 13, 2024
```
Former-commit-id: 93803ea1
```
  88625651
- Merge remote-tracking branch 'origin/v20.8_add_sub_weight_20240805' into test · 77145ffa
  由刘海泉提交于 8月 13, 2024
```
Former-commit-id: 7189127d
```
  77145ffa
- 修改货单取消更新失败的问题 · e6b5cd45
  由刘海泉提交于 8月 13, 2024
  
  e6b5cd45
- Merge remote-tracking branch 'origin/test' into test · 66b8acfa
  由杨启发提交于 8月 13, 2024
```
Former-commit-id: a88295f2
```
  66b8acfa
- Merge branch 'refs/heads/v20.9_settlement_20240805' into test · 11bd9ae1
  由杨启发提交于 8月 13, 2024
```
Former-commit-id: a655c7ea
```
  11bd9ae1
- Merge remote-tracking branch 'origin/v20.9_settlement_20240805' into v20.9_settlement_20240805 · afc6f6ba
  由杨启发提交于 8月 13, 2024
  
  afc6f6ba