# Conflicts:
#	performance-api/src/main/java/com/clx/performance/feign/PerformanceFeign.java
#	performance-api/src/main/java/com/clx/performance/vo/pc/OrderGoodsVO.java
#	performance-web/src/main/java/com/clx/performance/controller/feign/OrderGoodsFeignController.java
#	performance-web/src/main/java/com/clx/performance/controller/temp/TempController.java
#	performance-web/src/main/java/com/clx/performance/service/OrderGoodsService.java
#	performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementServiceImpl.java