提交 · d4c9b7166f94424cf706ae2e778fdc78476834be · 姜武杰 / clx-performance

13 8月, 2024 4 次提交
- Merge branch 'v21.1_jianzhuang_20240807' into test · d4c9b716
  由 jiangwujie 提交于 8月 13, 2024
```
Former-commit-id: df0abcfe
```
  d4c9b716
- feature(电子围栏): 如果从中交兴路无法获取数据，则从trace中获取卡车或者司机的位置来进行判断 · 48b62e2e
  由 jiangwujie 提交于 8月 13, 2024
  
  48b62e2e
- Merge branch 'refs/heads/v20.9_settlement_20240805' into test · d41051a7
  由杨启发提交于 8月 13, 2024
```
Former-commit-id: d74c5b1c
```
  d41051a7
- 结算单优化 · 7a9c9039
  由杨启发提交于 8月 13, 2024
  
  7a9c9039
12 8月, 2024 36 次提交
- Merge remote-tracking branch 'origin/v20.8_add_sub_weight_20240805' into test · 427b6388
  由刘海泉提交于 8月 12, 2024
```
Former-commit-id: ec30f690
```
  427b6388
- 修改批量取消报错的问题 · c070a912
  由刘海泉提交于 8月 12, 2024
  
  c070a912
- Merge remote-tracking branch 'origin/v20.8_add_sub_weight_20240805' into test · d3c5f548
  由刘海泉提交于 8月 12, 2024
```
Former-commit-id: a0331cc5
```
  d3c5f548
- 修改批量取消报错的问题 · a33c8571
  由刘海泉提交于 8月 12, 2024
  
  a33c8571
- Merge remote-tracking branch 'origin/test' into test · f6559b6e
  由刘海泉提交于 8月 12, 2024
```
Former-commit-id: 5d8bd0f9
```
  f6559b6e
- Merge remote-tracking branch 'origin/v20.8_add_sub_weight_20240805' into test · 7fa675a8
  由刘海泉提交于 8月 12, 2024
```
Former-commit-id: 5370a123
```
  7fa675a8
- merge to test · ad4fd014
  由 jiangwujie 提交于 8月 12, 2024
```
Former-commit-id: d37112c5
```
  ad4fd014
- 修改批量取消报错的问题 · 2ac5fa59
  由刘海泉提交于 8月 12, 2024
  
  2ac5fa59
- Merge branch 'refs/heads/v20.9_settlement_20240805' into test · 53e4e8e4
  由艾庆国提交于 8月 12, 2024
```
Former-commit-id: 27b0d0e6
```
  53e4e8e4
- 承运结算单优化 · 149d5d3f
  由艾庆国提交于 8月 12, 2024
  
  149d5d3f
- Merge remote-tracking branch 'origin/v20.8_add_sub_weight_20240805' into test · 1c13f71f
  由刘海泉提交于 8月 12, 2024
```
Former-commit-id: 53339e28
```
  1c13f71f
- 修改吨数计算 · 66474170
  由刘海泉提交于 8月 12, 2024
  
  66474170
- Merge remote-tracking branch 'origin/test' into test · 0fba4ce1
  由刘海泉提交于 8月 12, 2024
```
Former-commit-id: d14da591
```
  0fba4ce1
- Merge remote-tracking branch 'origin/v20.8_add_sub_weight_20240805' into test · 8dc2fa2d
  由刘海泉提交于 8月 12, 2024
```
Former-commit-id: 04b597fb
```
  8dc2fa2d
- 修改订单剩余吨数的计算公式 · 0924de84
  由刘海泉提交于 8月 12, 2024
  
  0924de84
- Merge branch 'refs/heads/v20.9_settlement_20240805' into test · 3ae345a6
  由杨启发提交于 8月 12, 2024
```
Former-commit-id: aedb888f
```
  3ae345a6
- 结算单优化 · 6ff3b7d6
  由杨启发提交于 8月 12, 2024
  
  6ff3b7d6
- 增加日志 · 3999883c
  由刘海泉提交于 8月 12, 2024
```
Former-commit-id: 364d216b
```
  3999883c
- Merge remote-tracking branch 'origin/test' into test · 8aa4b1ce
  由刘海泉提交于 8月 12, 2024
```
Former-commit-id: ebd85edc
```
  8aa4b1ce
- Merge remote-tracking branch 'origin/v20.8_add_sub_weight_20240805' into test · 4e1a21bd
  由刘海泉提交于 8月 12, 2024
```
Former-commit-id: 291b7d93
```
  4e1a21bd
- 修改计算剩余吨数字段值 · 8dccf5e1
  由刘海泉提交于 8月 12, 2024
  
  8dccf5e1
- Merge branch 'refs/heads/v20.9_settlement_20240805' into test · bb140eb6
  由艾庆国提交于 8月 12, 2024
```
Former-commit-id: f0ab174d
```
  bb140eb6
- 承运结算单优化 · dee51164
  由艾庆国提交于 8月 12, 2024
  
  dee51164
- Merge branch 'refs/heads/v20.9_settlement_20240805' into test · 04003146
  由杨启发提交于 8月 12, 2024
```
Former-commit-id: 7bd85b03
```
  04003146
- 结算单优化 · 00e70a6e
  由杨启发提交于 8月 12, 2024
  
  00e70a6e
- Merge remote-tracking branch 'origin/test' into test · d57d4f40
  由刘海泉提交于 8月 12, 2024
```
Former-commit-id: 8d18bf0d
```
  d57d4f40
- Merge remote-tracking branch 'origin/v20.8_add_sub_weight_20240805' into test · 1826db10
  由刘海泉提交于 8月 12, 2024
```
Former-commit-id: 0b6477d4
```
  1826db10
- 修改取消货单提示数据不存在的问题 · 04ced798
  由刘海泉提交于 8月 12, 2024
  
  04ced798
- Merge branch 'refs/heads/v20.9_settlement_20240805' into test · 72a323de
  由杨启发提交于 8月 12, 2024
```
Former-commit-id: c05c5928
```
  72a323de
- Merge remote-tracking branch 'origin/v20.9_settlement_20240805' into v20.9_settlement_20240805 · bc7d1e5c
  由杨启发提交于 8月 12, 2024
  
  bc7d1e5c
- 结算单优化 · e1194f0b
  由杨启发提交于 8月 12, 2024
  
  e1194f0b
- Merge branch 'refs/heads/v20.9_settlement_20240805' into test · 810ceb70
  由艾庆国提交于 8月 12, 2024
```
Former-commit-id: 11d55b5f
```
  810ceb70
- 承运结算单优化 · c82c197f
  由艾庆国提交于 8月 12, 2024
  
  c82c197f
- Merge remote-tracking branch 'origin/test' into test · c0d80d0b
  由刘海泉提交于 8月 12, 2024
```
Former-commit-id: 71a460e6
```
  c0d80d0b
- Merge remote-tracking branch 'origin/v20.8_add_sub_weight_20240805' into test · 9be88cf9
  由刘海泉提交于 8月 12, 2024
```
Former-commit-id: 6f3c62e2
```
  9be88cf9
- 增加订单的可提取吨数字段 · bc36aaa8
  由刘海泉提交于 8月 12, 2024
  
  bc36aaa8