提交 · 82ea8f1030fbc4b4eb45d599099db5001624315f · 姜武杰 / clx-performance

22 12月, 2023 19 次提交
- Merge remote-tracking branch 'origin/test' into test · 82ea8f10
  由 huyufan 提交于 12月 22, 2023
```
Former-commit-id: 0f6e0316
```
  82ea8f10
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · f0521c9d
  由 huyufan 提交于 12月 22, 2023
```
Former-commit-id: bf583b46
```
  f0521c9d
- APP司机账户 · c313874f
  由 huyufan 提交于 12月 22, 2023
  
  c313874f
- Merge remote-tracking branch 'origin/v8.6_small_version_fix_20231218' into test · ba7bbdf1
  由 liuhaiquan 提交于 12月 22, 2023
```
# Conflicts:
#	performance-web/src/main/java/com/clx/performance/dao/settle/SettlementOwnerDetailDao.java
#	performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOwnerServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/settle/SettlementMqHandlerService.java
#	performance-web/src/main/java/com/clx/performance/service/settle/SettlementOwnerService.java


Former-commit-id: cb23ea6d
```
  ba7bbdf1
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · 362e3c62
  由 huyufan 提交于 12月 22, 2023
```
Former-commit-id: 158c2a00
```
  362e3c62
- APP司机账户 · 05d4a984
  由 huyufan 提交于 12月 22, 2023
  
  05d4a984
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · 7e392664
  由 huyufan 提交于 12月 22, 2023
```
Former-commit-id: 36435966
```
  7e392664
- APP司机账户 · 4a93656c
  由 huyufan 提交于 12月 22, 2023
  
  4a93656c
- APP司机账户 · ecbe238e
  由 huyufan 提交于 12月 22, 2023
  
  ecbe238e
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · a85efeb6
  由 huyufan 提交于 12月 22, 2023
```
Former-commit-id: 51b5e4ba
```
  a85efeb6
- APP司机账户 · d3dfeb7f
  由 huyufan 提交于 12月 22, 2023
  
  d3dfeb7f
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · 9ad7d087
  由 huyufan 提交于 12月 22, 2023
```
Former-commit-id: 6770020c
```
  9ad7d087
- APP司机账户 · 8fc48463
  由 huyufan 提交于 12月 22, 2023
  
  8fc48463
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · 5000ca26
  由 huyufan 提交于 12月 22, 2023
```
Former-commit-id: 1c9d39e7
```
  5000ca26
- APP司机账户 · a45edc27
  由 huyufan 提交于 12月 22, 2023
  
  a45edc27
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · f9abed25
  由 huyufan 提交于 12月 22, 2023
```
Former-commit-id: cbb9bdf0
```
  f9abed25
- APP司机账户 · ea66c459
  由 huyufan 提交于 12月 22, 2023
  
  ea66c459
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · 76c05a51
  由 huyufan 提交于 12月 22, 2023
```
Former-commit-id: 31061e0a
```
  76c05a51
- APP司机账户 · d92a69d0
  由 huyufan 提交于 12月 22, 2023
  
  d92a69d0
21 12月, 2023 21 次提交
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · fb623522
  由 huyufan 提交于 12月 21, 2023
```
Former-commit-id: aef6f031
```
  fb623522
- APP司机账户 · 7dc98e68
  由 huyufan 提交于 12月 21, 2023
  
  7dc98e68
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · bcb14de6
  由 huyufan 提交于 12月 21, 2023
```
Former-commit-id: 1f265236
```
  bcb14de6
- APP司机账户 · 3dbe20da
  由 huyufan 提交于 12月 21, 2023
  
  3dbe20da
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · e161d2a1
  由 huyufan 提交于 12月 21, 2023
```
Former-commit-id: 1b24a518
```
  e161d2a1
- APP司机账户 · 21b635e0
  由 huyufan 提交于 12月 21, 2023
  
  21b635e0
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · fde42a50
  由 huyufan 提交于 12月 21, 2023
```
Former-commit-id: d06bd97f
```
  fde42a50
- APP司机账户 · fcb73b3a
  由 huyufan 提交于 12月 21, 2023
  
  fcb73b3a
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · 4e108d30
  由 huyufan 提交于 12月 21, 2023
```
Former-commit-id: 10a006f0
```
  4e108d30
- APP司机账户 · d2f3bc99
  由 huyufan 提交于 12月 21, 2023
  
  d2f3bc99
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · e6ee47bf
  由 huyufan 提交于 12月 21, 2023
```
Former-commit-id: 80b5a91f
```
  e6ee47bf
- APP司机账户 · ec552233
  由 huyufan 提交于 12月 21, 2023
  
  ec552233
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · a7de0ece
  由 huyufan 提交于 12月 21, 2023
```
# Conflicts:
#	performance-web/src/main/java/com/clx/performance/service/impl/OwnerAccountServiceImpl.java


Former-commit-id: 1f70886a
```
  a7de0ece
- 解冻账户判断重复解冻 · 8361da60
  由 huyufan 提交于 12月 21, 2023
  
  8361da60
- Merge remote-tracking branch 'origin/test' into test · d1ff3bd4
  由 huyufan 提交于 12月 21, 2023
```
Former-commit-id: 7154636d
```
  d1ff3bd4
- Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into test · a2c0ce0f
  由 huyufan 提交于 12月 21, 2023
```
Former-commit-id: dd8d28e7
```
  a2c0ce0f
- APP司机账户 · 9547fd67
  由 huyufan 提交于 12月 21, 2023
  
  9547fd67
- Merge remote-tracking branch 'origin/test' into test · fd058169
  由 liuhaiquan 提交于 12月 21, 2023
```
Former-commit-id: 063409f5
```
  fd058169
- Merge remote-tracking branch 'origin/v7.9_small_version_fix_20231213' into test · 28ec9667
  由 liuhaiquan 提交于 12月 21, 2023
```
Former-commit-id: d482cc4a
```
  28ec9667
- 修改队列消息延迟设置 · 6f0d520e
  由 liuhaiquan 提交于 12月 21, 2023
  
  6f0d520e
- 修改队列消息延迟设置 · 6804d348
  由 liuhaiquan 提交于 12月 21, 2023
  
  6804d348