Merge remote-tracking branch 'origin/master'

@@ -62,6 +62,12 @@ public class EquipmentMaintainPlan {
     private Integer delFlag;
     private Integer delFlag;
     @ApiModelProperty(value = "是否发布")
     @ApiModelProperty(value = "是否发布")
     private Integer releaseStatus;
     private Integer releaseStatus;
+
+    @ApiModelProperty(value = "维保类型")
+    @Dict(dicCode = "maintenance_type")
+    private String maintenanceType;
+    @ApiModelProperty(value = "预估费用")
+    private String planCost;
     /**
     /**
      * 创建人id
      * 创建人id
      */
      */

@@ -23,7 +23,7 @@ public class EquipmentMaintainTask {
     @TableId(type = IdType.UUID)
     @TableId(type = IdType.UUID)
     private String id;
     private String id;
     @ApiModelProperty(value = "维护前图片路径")
     @ApiModelProperty(value = "维护前图片路径")
-  private String  maintenanceFrontUrl;
+    private String  maintenanceFrontUrl;
     @ApiModelProperty(value = "维护后图片路径")
     @ApiModelProperty(value = "维护后图片路径")
     private String  maintenanceAfterUrl;
     private String  maintenanceAfterUrl;
     @ApiModelProperty(value = "厂站id")
     @ApiModelProperty(value = "厂站id")
@@ -64,6 +64,8 @@ public class EquipmentMaintainTask {
     private String deviceAdministratorId;
     private String deviceAdministratorId;
     @ApiModelProperty(value = "设备管理员名称")
     @ApiModelProperty(value = "设备管理员名称")
     private String deviceAdministratorName;
     private String deviceAdministratorName;
+    @ApiModelProperty(value = "维护费用")
+    private String maintenanceCost;
 
 
     /**
     /**
      * 创建人id
      * 创建人id

@@ -51,8 +51,8 @@ public class EquipmentMaintainTaskVO extends EquipmentMaintainTask {
     private Integer cycle;
     private Integer cycle;
     @ApiModelProperty(value = "循环周期单位")
     @ApiModelProperty(value = "循环周期单位")
     private String cycleUnit;
     private String cycleUnit;
-    @ApiModelProperty(value = "维保总体费用")
-    private String maintenanceCost;
+//    @ApiModelProperty(value = "维保总体费用")
+//    private String maintenanceCost;
     @ApiModelProperty(value = "所属公司名称")
     @ApiModelProperty(value = "所属公司名称")
     private String departName;
     private String departName;
     @ApiModelProperty(value = "班组名称")
     @ApiModelProperty(value = "班组名称")