# Conflicts:
#	performance-api/src/main/java/com/clx/performance/feign/PerformanceSDKFeign.java
#	performance-web/src/main/java/com/clx/performance/controller/feign/PerformanceSdkFeignController.java
#	performance-web/src/main/java/com/clx/performance/extranal/user/OrderService.java
#	performance-web/src/main/java/com/clx/performance/extranal/user/impl/OrderServiceImpl.java


Former-commit-id: 4f8d353d