# Conflicts:
#	performance-web/pom.xml
#	performance-web/src/main/java/com/clx/performance/controller/temp/TempController.java


Former-commit-id: be3f81ee