# Conflicts:
#	performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java
#	performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java
#	performance-web/src/main/java/com/clx/performance/service/OrderGoodsService.java


Former-commit-id: 3c34ec92

Former-commit-id: 8cff972e

Former-commit-id: 710742e8

Former-commit-id: d0f6df6f

Former-commit-id: 103683ce

Former-commit-id: ed7adc6c

# Conflicts:
#	performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java
#	performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java


Former-commit-id: 7fd94dcc

Former-commit-id: de1a7f60

Former-commit-id: 1822ccf3

Former-commit-id: 07569722

Former-commit-id: 9bd97c12

Former-commit-id: 0e2401c7

Merge branch 'v17.5_order_child_sync_broker_20240617' of https://t.clxkj.cn/clx-java/clx-performance into test


Former-commit-id: 5dfc4007

Former-commit-id: 708fd5ae

Former-commit-id: 80f57868

Former-commit-id: 06e9bd9a

Former-commit-id: 3cb8897b

Former-commit-id: 40956006

Former-commit-id: 86f54656