# 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/pom.xml
#	performance-web/src/main/java/com/clx/performance/controller/feign/PerformanceSdkFeignController.java
#	performance-web/src/main/java/com/clx/performance/controller/temp/TempTraceController.java
#	performance-web/src/main/java/com/clx/performance/dao/AppDao.java
#	performance-web/src/main/java/com/clx/performance/dao/OrderChildDao.java
#	performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java
#	performance-web/src/main/java/com/clx/performance/mapper/AppMapper.java
#	performance-web/src/main/java/com/clx/performance/model/App.java
#	performance-web/src/main/java/com/clx/performance/service/OrderChildService.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/trace/TruckTraceService.java