修改冲突代码

performance-web/src/main/java/com/clx/performance/constant/RedissonConstants.java

@@ -10,12 +10,4 @@ public class RedissonConstants {
     //货主违约结算单支付锁
     public static final String BREAK_CONTRACT_SETTLEMENT_OWNER_BATCH_PAY_ID_LOCK = "clx-performance:breakContractSettlementOwner:batchPay:id:";
 
-
-
-
-
-    //货主结算单支付锁
-    public static final String SETTLEMENT_OWNER_BATCH_PAY_ID_LOCK = "clx-performance:settlementOwner:batchPay:id:";
-    //货主违约结算单支付锁
-    public static final String BREAK_CONTRACT_SETTLEMENT_OWNER_BATCH_PAY_ID_LOCK = "clx-performance:breakContractSettlementOwner:batchPay:id:";
 }