# Conflicts:
#	performance-api/src/main/java/com/clx/performance/vo/app/OrderChildVO.java
#	performance-web/pom.xml
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java


Former-commit-id: af7abbd9