Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetail.java

@@ -48,4 +48,6 @@ public class BusVehicleApplyDetail extends BaseEntity {
     private BigDecimal applyForDeposit;
     @ApiModelProperty("内部编码")
     private String insideCode;
+    @ApiModelProperty(value = "厂家合同价")
+    private Integer contractPrice;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailDto.java

@@ -48,4 +48,6 @@ public class BusVehicleApplyDetailDto implements Dto {
     private String remarks; // 备注
     @ApiModelProperty("内部编码")
     private String insideCode;
+    @ApiModelProperty(value = "厂家合同价")
+    private Integer contractPrice;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailVo.java

@@ -47,4 +47,6 @@ public class BusVehicleApplyDetailVo implements Vo {
     private String remarks;
     @ApiModelProperty("内部编码")
     private String insideCode;
+    @ApiModelProperty(value = "厂家合同价")
+    private Integer contractPrice;
 }