hbwri/skjcmanager.git

			@@ -1,7 +1,6 @@
			package cn.gistack.sm.sjztmd.entity;

			import com.baomidou.mybatisplus.annotation.TableField;
			import com.baomidou.mybatisplus.annotation.TableName;
			import com.baomidou.mybatisplus.annotation.*;
			import com.fasterxml.jackson.annotation.JsonFormat;
			import com.fasterxml.jackson.databind.annotation.JsonSerialize;
			import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
			@@ -30,7 +29,7 @@
			*/
			@JsonSerialize(using = ToStringSerializer.class)
			@ApiModelProperty(value = "主键")
			@TableField("\"guid\"")
			@TableId(value = "\"guid\"",type = IdType.ASSIGN_ID)
			private String guid;

			/**
			@@ -41,25 +40,39 @@
			private String resGuid;

			/**
			* 名称
			*/
			@ApiModelProperty(value = "名称")
			@TableField(value = "\"name\"",fill = FieldFill.UPDATE)
			private String name;

			/**
			* 数量
			*/
			@ApiModelProperty(value = "数量")
			@TableField(value = "\"num\"",fill = FieldFill.UPDATE)
			private Integer num;

			/**
			* 厂房布置型式
			*/
			@ApiModelProperty(value = "厂房布置型式")
			@TableField("\"plant_layout_type\"")
			private Integer plantLayoutType;
			@TableField(value = "\"plant_layout_type\"",fill = FieldFill.UPDATE)
			private String plantLayoutType;

			/**
			* 装机容量
			*/
			@ApiModelProperty(value = "装机容量")
			@TableField("\"installed_capacity\"")
			private Integer installedCapacity;
			@TableField(value = "\"installed_capacity\"",fill = FieldFill.UPDATE)
			private double installedCapacity;

			/**
			* 平均年利用小时
			*/
			@ApiModelProperty(value = "平均年利用小时")
			@TableField("\"year_avg_hour\"")
			private Integer yearAvgHour;
			@TableField(value = "\"year_avg_hour\"",fill = FieldFill.UPDATE)
			private double yearAvgHour;

			/**
			* 填报状态（0:填写中，1:审核中，2:审核通过）