Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/protocols/entity/vo/AgreementProductCosts.java

@@ -6,6 +6,7 @@ import com.ydtech.modules.protocols.entity.po.PtlAgreementProductCostsAttrLink;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Data
@@ -72,58 +73,58 @@ public class AgreementProductCosts {
     // ---------------
     // ---------------
     @ApiModelProperty(value = "交强出口比例一级")
-    private String jqExportRadioLevel1;
+    private BigDecimal jqExportRadioLevel1;
 
     @ApiModelProperty(value = "交强出口比例二级")
-    private String jqExportRadioLevel2;
+    private BigDecimal jqExportRadioLevel2;
 
     @ApiModelProperty(value = "交强出口比例三级")
-    private String jqExportRadioLevel3;
+    private BigDecimal jqExportRadioLevel3;
 
     @ApiModelProperty(value = "交强出口比例四级")
-    private String jqExportRadioLevel4;
+    private BigDecimal jqExportRadioLevel4;
 
     @ApiModelProperty(value = "交强出口比例五级")
-    private String jqExportRadioLevel5;
+    private BigDecimal jqExportRadioLevel5;
 
     @ApiModelProperty(value = "交强出口加投比例")
-    private String jqExportInvestmentRadio;
+    private BigDecimal jqExportInvestmentRadio;
 
     @ApiModelProperty(value = "商业出口比例一级")
-    private String syExportRadioLevel1;
+    private BigDecimal syExportRadioLevel1;
 
     @ApiModelProperty(value = "商业出口比例二级")
-    private String syExportRadioLevel2;
+    private BigDecimal syExportRadioLevel2;
 
     @ApiModelProperty(value = "商业出口比例三级")
-    private String syExportRadioLevel3;
+    private BigDecimal syExportRadioLevel3;
 
     @ApiModelProperty(value = "商业出口比例四级")
-    private String syExportRadioLevel4;
+    private BigDecimal syExportRadioLevel4;
 
     @ApiModelProperty(value = "商业出口比例五级")
-    private String syExportRadioLevel5;
+    private BigDecimal syExportRadioLevel5;
 
     @ApiModelProperty(value = "商业出口加投比例")
-    private String syExportInvestmentRadio;
+    private BigDecimal syExportInvestmentRadio;
 
     @ApiModelProperty(value = "非车出口比例一级")
-    private String noCarExportRadioLevel1;
+    private BigDecimal noCarExportRadioLevel1;
 
     @ApiModelProperty(value = "非车出口比例二级")
-    private String noCarExportRadioLevel2;
+    private BigDecimal noCarExportRadioLevel2;
 
     @ApiModelProperty(value = "非车出口比例三级")
-    private String noCarExportRadioLevel3;
+    private BigDecimal noCarExportRadioLevel3;
 
     @ApiModelProperty(value = "非车出口比例四级")
-    private String noCarExportRadioLevel4;
+    private BigDecimal noCarExportRadioLevel4;
 
     @ApiModelProperty(value = "非车出口比例五级")
-    private String noCarExportRadioLevel5;
+    private BigDecimal noCarExportRadioLevel5;
 
     @ApiModelProperty(value = "非车出口加投比例")
-    private String noCarExportInvestmentRadio;
+    private BigDecimal noCarExportInvestmentRadio;
 
 
     @ApiModelProperty(value = "费用属性")