Former-commit-id: db83c52f

Former-commit-id: 5c926f7e

Former-commit-id: 2402f3e8

Former-commit-id: b4a841e4

Former-commit-id: 32377850

Merge remote-tracking branch 'origin/v18.5_pound_list_ocr_20240701' into v18.5_pound_list_ocr_20240701

Former-commit-id: 5036a952

Former-commit-id: 829527a4

Former-commit-id: 313f6e13

Former-commit-id: f6114678

Former-commit-id: 7b449e55

Former-commit-id: 85230ef8

Former-commit-id: df74a4af

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


Former-commit-id: 0c1750bb

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

Former-commit-id: e0705555

Former-commit-id: 53837329

Former-commit-id: 2d54ffff

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


Former-commit-id: 21d4090c

Former-commit-id: 8bb4288b

Former-commit-id: 781168a9