Merge remote-tracking branch 'origin/master'

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java

@@ -115,7 +115,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
             if (StringUtils.isNotBlank(importReturn.getCheckInfo2())) {
                 return rb.success().setData(resultList).setMsg(importReturn.getCheckInfo2());
             } else {
-                return rb.success().setData(resultList).setMsg("成功导入" + size + "条数据，请点击确定按钮");
+                return rb.success().setData(resultList).setMsg("成功导入数据，请点击确定按钮");
             }
         } else {
             String checkResult = importReturn.getCheckInfo();

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml

@@ -14,6 +14,6 @@
         from loan_repayment_plan_details
         where bankContractNo = #{bankContractNo}
           and `period` = #{period}
-          and policyOrOther = '0'
+          -- and policyOrOther = '0'
     </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanwarrantinformation/LoanWarrantInformationService.java

@@ -345,7 +345,7 @@ public class LoanWarrantInformationService extends MybatisBaseService<LoanWarran
         String[] sids = dto.getSids();
         for (String sid : sids) {
             LoanWarrantInformation entity = fetchBySid(sid);
-            BeanUtil.copyProperties(dto, entity, "id", "sid");
+            BeanUtil.copyProperties(dto, entity, "id", "sid","vehicleMark");
             entity.setTransferDate(new DateTime());
             entity.setAuditStateKey("003");
             entity.setAuditStateValue("已移交");