# Conflicts:
#	performance-api/src/main/java/com/clx/performance/feign/PerformanceSDKFeign.java
#	performance-api/src/main/java/com/clx/performance/vo/pc/OrderGoodsVO.java
#	performance-web/src/main/java/com/clx/performance/controller/feign/PerformanceSdkFeignController.java
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java
#	performance-web/src/main/java/com/clx/performance/service/impl/PerformanceProgressServiceImpl.java