# Conflicts:
#	performance-api/src/main/java/com/clx/performance/enums/AppEnum.java
#	performance-web/pom.xml
#	performance-web/src/main/java/com/clx/performance/dao/AppDao.java
#	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/mapper/AppMapper.java
#	performance-web/src/main/java/com/clx/performance/model/App.java
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java