# 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/test/java/com/clx/performance/JobTest.java


Former-commit-id: aa499728

Former-commit-id: 99d8dec9

Former-commit-id: 7c2da628

Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into v6.5_transport_open_20231115

Former-commit-id: 4743afb4

Former-commit-id: 16dbc4ff

Former-commit-id: a07bb4cb

# Conflicts:
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java


Former-commit-id: 8eccc390

# Conflicts:
#	performance-web/src/main/java/com/clx/performance/component/OrderGoodsStatusLazyComponent.java

Former-commit-id: 06ee6501

Merge remote-tracking branch 'origin/v6.5_transport_open_20231115' into v6.5_transport_open_20231115

Former-commit-id: f2f4ef1a

Former-commit-id: 8b37a1be

Former-commit-id: ec8ebe12

Former-commit-id: 518bfdcc

Former-commit-id: f0d0b123

Former-commit-id: 287009bf