# 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/dao/impl/OrderGoodsDaoImpl.java