Merge remote-tracking branch 'origin/master'

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/AppPolicyDetailsVo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.riskcenter.api.loanfinpolicy;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.AppOtherPolicyVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
@@ -58,6 +59,10 @@ public class AppPolicyDetailsVo implements Vo {
     private String nominalPrice;
     @ApiModelProperty("有效期至")
     private String validDateTo;
+    @ApiModelProperty("保证金类型")
+    private String bondType;
+    @ApiModelProperty("贴息放款类型")
+    private String discountUseType;
     private int isOtherProduct;
     @ApiModelProperty("其他融")
     private AppOtherPolicyVo otherInfo;

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml

@@ -114,7 +114,9 @@
                lfp.validDateTo,
                lfp.isOtherProduct,
                lfp.vehTypeValue,
-               lfp.bondRatio
+               lfp.bondRatio,
+               lfp.bondType,
+               lfp.discountUseType
         from loan_fin_policy lfp
         where lfp.sid = #{sid}
     </select>

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/financialPolicy/FinancialPolicyDetailsVo.java

@@ -74,6 +74,12 @@ public class FinancialPolicyDetailsVo implements Vo {
     @ApiModelProperty("有效期至")
     @JsonProperty("validDateTo")
     private String validDateTo;
+    @ApiModelProperty("保证金类型")
+    @JsonProperty("bondType")
+    private String bondType;
+    @ApiModelProperty("贴息放款类型")
+    @JsonProperty("discountUseType")
+    private String discountUseType;
     @ApiModelProperty("其他融")
     private FinancialOtherPolicyVo otherInfo;
 }