代码合并问题解决

26e60b71 · huningning · 42664726 · 26e60b71
--- a/performance-api/src/main/java/com/clx/performance/enums/OrderChildEnum.java
+++ b/performance-api/src/main/java/com/clx/performance/enums/OrderChildEnum.java