提交 · 126e496b1c7d53451dc58117a11ca1fd76497f1e · 姜武杰 / clx-performance

04 2月, 2024 40 次提交
- Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118' into test · 126e496b
  由 huyufan 提交于 2月 04, 2024
```
Former-commit-id: f3b4bd14
```
  126e496b
- Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118'… · 22606c93
  由 huyufan 提交于 2月 04, 2024
```
Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118' into v10.7_borrowing_and_repayment_20240118
```
  22606c93
- 接单判断 · a8ebe7cd
  由 huyufan 提交于 2月 04, 2024
  
  a8ebe7cd
- Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118' into test · c2e857c1
  由 liuhaiquan 提交于 2月 04, 2024
```
Former-commit-id: 6cf6718e
```
  c2e857c1
- 修改json 类型转换 · 55d807ce
  由 liuhaiquan 提交于 2月 04, 2024
  
  55d807ce
- Merge remote-tracking branch 'origin/test' into test · 4fab5538
  由 liuhaiquan 提交于 2月 04, 2024
```
Former-commit-id: 4450bcbd
```
  4fab5538
- Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118' into test · 31f4d9d3
  由 liuhaiquan 提交于 2月 04, 2024
```
Former-commit-id: ecfd41f5
```
  31f4d9d3
- Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118'… · 2482a001
  由 liuhaiquan 提交于 2月 04, 2024
```
Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118' into v10.7_borrowing_and_repayment_20240118
```
  2482a001
- 修改字段类型 · 3f1327ca
  由 liuhaiquan 提交于 2月 04, 2024
  
  3f1327ca
- Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118' into test · 1f65b881
  由 huyufan 提交于 2月 04, 2024
```
Former-commit-id: 5593d836
```
  1f65b881
- 接单判断 · 080b2de1
  由 huyufan 提交于 2月 04, 2024
  
  080b2de1
- 承运借款流程-借款方 · db62f812
  由 aiqingguo 提交于 2月 04, 2024
  
  db62f812
- Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118' into test · 294781f1
  由 liuhaiquan 提交于 2月 04, 2024
```
Former-commit-id: 42f7ace1
```
  294781f1
- 修改请求方式 · 04b4597f
  由 liuhaiquan 提交于 2月 04, 2024
  
  04b4597f
- Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118' into test · 28854062
  由 liuhaiquan 提交于 2月 04, 2024
```
Former-commit-id: 6b32207c
```
  28854062
- Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118'… · 15a32e32
  由 liuhaiquan 提交于 2月 04, 2024
```
Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118' into v10.7_borrowing_and_repayment_20240118
```
  15a32e32
- 修改模版 · 953defc8
  由 liuhaiquan 提交于 2月 04, 2024
  
  953defc8
- Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118' into test · 4d10f0af
  由 huyufan 提交于 2月 04, 2024
```
Former-commit-id: d4acbd48
```
  4d10f0af
- Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118'… · 152d9965
  由 huyufan 提交于 2月 04, 2024
```
Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118' into v10.7_borrowing_and_repayment_20240118
```
  152d9965
- 接单判断 · 6ff2732b
  由 huyufan 提交于 2月 04, 2024
  
  6ff2732b
- Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118' into test · 125eede8
  由 huyufan 提交于 2月 04, 2024
```
Former-commit-id: 009567f3
```
  125eede8
- 接单判断 · 27f5761d
  由 huyufan 提交于 2月 04, 2024
  
  27f5761d
- Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118'… · 158ee68e
  由 liuhaiquan 提交于 2月 04, 2024
```
Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118' into v10.7_borrowing_and_repayment_20240118
```
  158ee68e
- Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118'… · e6f02f1a
  由 liuhaiquan 提交于 2月 04, 2024
```
Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118' into v10.7_borrowing_and_repayment_20240118
```
  e6f02f1a
- 增加收款银行和收款银行编码字段 · 98c72539
  由 liuhaiquan 提交于 2月 04, 2024
  
  98c72539
- Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118' into test · 89681231
  由 huyufan 提交于 2月 04, 2024
```
Former-commit-id: 147c282c
```
  89681231
- 接单判断 · 6e537e9c
  由 huyufan 提交于 2月 04, 2024
  
  6e537e9c
- Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118' into test · c2f72425
  由 huyufan 提交于 2月 04, 2024
```
Former-commit-id: 169d7cd0
```
  c2f72425
- Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118'… · d1be2513
  由 huyufan 提交于 2月 04, 2024
```
Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118' into v10.7_borrowing_and_repayment_20240118
```
  d1be2513
- 接单判断 · d6366c79
  由 huyufan 提交于 2月 04, 2024
  
  d6366c79
- Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118'… · 0c58215c
  由 liuhaiquan 提交于 2月 04, 2024
```
Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118' into v10.7_borrowing_and_repayment_20240118
```
  0c58215c
- 修改货主借款账户信息接口 · 8dae16e7
  由 liuhaiquan 提交于 2月 04, 2024
  
  8dae16e7
- Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118' into test · d2ddd796
  由 huyufan 提交于 2月 04, 2024
```
Former-commit-id: b27ed398
```
  d2ddd796
- 接单判断 · 46793187
  由 huyufan 提交于 2月 04, 2024
  
  46793187
- Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118'… · 94b45f9e
  由 liuhaiquan 提交于 2月 04, 2024
```
Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118' into v10.7_borrowing_and_repayment_20240118
```
  94b45f9e
- 修改VO的类名 · 81c9d39f
  由 liuhaiquan 提交于 2月 04, 2024
  
  81c9d39f
- 注释 · dbd0530f
  由 huyufan 提交于 2月 04, 2024
```
Former-commit-id: 35fe7d48
```
  dbd0530f
- Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118' into test · 093c2aec
  由 huyufan 提交于 2月 04, 2024
```
# Conflicts:
#	performance-web/src/main/java/com/clx/performance/controller/temp/TempController.java
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementServiceImpl.java


Former-commit-id: 93d6b926
```
  093c2aec
- 接单借款判断 · 447715a2
  由 huyufan 提交于 2月 04, 2024
  
  447715a2
- 承运借款流程-借款账户 · 90e6271a
  由 aiqingguo 提交于 2月 04, 2024
  
  90e6271a