解决冲突

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

@@ -137,13 +137,6 @@ public enum PerformanceResultEnum implements ResultEnum {
     NB_BANK_ORDER_PAY_ERROR(1803, "宁波银行订单支付失败"),
     NB_BANK_NO_MONEY_ERROR(1804, "账户余额不足"),
 
-    PLATFORM_ACCOUNT_CONFIG_ONLY(1913, "当前配置已存在"),
-    PLATFORM_ACCOUNT_CONFIG_WITHDRAWAL_IS_NULL(1914, "提现平台账户未配置"),
-    PLATFORM_ACCOUNT_CONFIG_WITHDRAWAL_MANY(1915, "提现平台账户配置不唯一"),
-    PLATFORM_ACCOUNT_CONFIG_RECHARGE_IS_NULL(1916, "充值平台账户未配置"),
-    PLATFORM_ACCOUNT_CONFIG_RECHARGE_MANY(1917, "充值平台账户配置不唯一"),
-    PLATFORM_ACCOUNT_CONFIG_IS_NULL(1918, "平台账户未配置"),
-    PLATFORM_ACCOUNT_CONFIG_MANY(1919, "平台账户配置不唯一"),
     GET_LOAN_RECORD(1901, "货主借款失败"),
     OWNER_ACCOUNT_ERROR(1902, "货主货款不足"),
 
@@ -154,7 +147,6 @@ public enum PerformanceResultEnum implements ResultEnum {
     OWNER_LOAN_RECORD_PAY_WAIT_ERROR(1853,"当前借款单状态不是待付款"),
     OWNER_LOAN_PAYMENT_STATUS_ERROR(1854, "执行借款审批失败,请稍后重试"),
     OWNER_LOAN_PAY_STATUS_ERROR(1855, "付款失败"),
-    DATA_STATUS_ERROR(1856, "当前状态有误")
 
     ;
     private final int code;