Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -2463,9 +2463,9 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             busSidList.removeAll(applyBusSidList);
             //根据合同编号以及车辆sid查询busVinSid
             List<String> busVinSidList = baseMapper.selectByContractNoToVinSid(dto.getContractId(), vinSid);
-            busSidList.removeAll(busVinSidList);
             busVinSidList.removeAll(Collections.singleton(null));
-            if (busVinSidList.isEmpty()) {
+            busSidList.removeAll(busVinSidList);
+            if (busSidList.isEmpty()) {
                 isTrue = true;
             }
             //是否是最后一批出库车辆

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java

@@ -881,7 +881,6 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                         if (maxLoanAmountRat.compareTo(new BigDecimal(dto.getOtherPolicyAmount())) < 0) {
                             return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
                         }
-
                     }
                 }
             } else {