# Conflicts:
#	performance-api/src/main/java/com/clx/performance/enums/PerformanceResultEnum.java
#	performance-api/src/main/java/com/clx/performance/feign/PerformanceFeign.java
#	performance-web/src/main/java/com/clx/performance/constant/RedisConstants.java
#	performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java
#	performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsDaoImpl.java
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java
#	performance-web/src/test/java/com/clx/performance/JobTest.java