代码合并问题解决

performance-api/src/main/java/com/clx/performance/enums/PerformanceResultEnum.java

@@ -85,7 +85,7 @@ public enum PerformanceResultEnum implements ResultEnum {
     MONEY_NO_SAME(1501, "货主提现金额和平台支付金额不一致"),
 
     ORDER_GOODS_WEIGHT_NOT_HAVE(1601, "货单可拉运吨数不足"),
-    ORDER_GOODS_STATUS_NOT_GET(1602, "当前货单已关闭不可继续提取")
+    ORDER_GOODS_STATUS_NOT_GET(1602, "当前货单已关闭不可继续提取"),
 
     INTEGRAL_RULE_NO_FOUND(1700, "积分规则不存在"),
     INTEGRAL_RULE_RATIO_OVERLAP(1701, "层级划分范围重叠"),