Former-commit-id: bca1ce56

Merge branch 'v20.0_kamo_new_column_20240726' of https://t.clxkj.cn/clx-java/clx-performance into test


Former-commit-id: cfa59451

Former-commit-id: 6e398a3b

Former-commit-id: 9da65b48

# Conflicts:
#	performance-web/src/main/java/com/clx/performance/dao/OrderGoodsDao.java
#	performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsDaoImpl.java
#	performance-web/src/main/java/com/clx/performance/listener/OrderChildDtsListener.java
#	performance-web/src/main/java/com/clx/performance/service/OrderChildService.java


Former-commit-id: c202191c

# Conflicts:
#	performance-web/src/main/java/com/clx/performance/dao/OrderGoodsDao.java
#	performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsDaoImpl.java
#	performance-web/src/main/java/com/clx/performance/listener/OrderChildDtsListener.java
#	performance-web/src/main/java/com/clx/performance/service/OrderChildService.java
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

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


Former-commit-id: d9564cfe

Former-commit-id: f9ecfd0e

Former-commit-id: a18a2488

Former-commit-id: b440340a

Former-commit-id: c6406ddb

Former-commit-id: 2a52876b

Former-commit-id: 4a2ec045

Former-commit-id: c36ca86b

Former-commit-id: 77851284

Former-commit-id: ef59b739

Former-commit-id: 4d25d263

Former-commit-id: 165a9c3f

Former-commit-id: 9d6300c0

Former-commit-id: 18b22730