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


Former-commit-id: 926a4186