# 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/component/IdGenerateSnowFlake.java
#	performance-web/src/main/java/com/clx/performance/component/OrderGoodsStatusLazyComponent.java
#	performance-web/src/main/java/com/clx/performance/constant/RedisConstants.java
#	performance-web/src/main/java/com/clx/performance/controller/pc/GoodsOrderController.java
#	performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java
#	performance-web/src/main/java/com/clx/performance/dao/OrderGoodsDao.java
#	performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsDaoImpl.java
#	performance-web/src/main/java/com/clx/performance/mapper/OrderGoodsMapper.java
#	performance-web/src/main/java/com/clx/performance/service/OrderGoodsService.java
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/sqlProvider/OrderGoodsSqlProvider.java
#	performance-web/src/main/java/com/clx/performance/strategy/GoodsOrderStrategy.java
#	performance-web/src/test/java/com/clx/performance/JobTest.java