pipIrr-SV.git - Gitblit

			@@ -31,22 +31,22 @@
			* 村ID
			*/
			@Schema(description = "所在村ID", requiredMode = Schema.RequiredMode.REQUIRED)
			@NotNull(message = "所在村不能为空")
			private Long villageid;
			//@NotNull(message = "所在村不能为空")
			private Long villageId;

			/**
			* 片区ID
			*/
			@Schema(description = "所在片区ID", requiredMode = Schema.RequiredMode.REQUIRED)
			@NotNull(message = "所在片区不能为空")
			private Long blockid;
			//@NotNull(message = "所在片区不能为空")
			private Long blockId;

			/**
			* 分水房ID
			*/
			@Schema(description = "所在分水房ID", requiredMode = Schema.RequiredMode.REQUIRED)
			@NotNull(message = "所在分水房不能为空")
			private Long divideid;
			//@NotNull(message = "所在分水房不能为空")
			private Long divideId;

			/**
			* 农户姓名
			@@ -68,9 +68,9 @@
			* 身份证号
			*/
			@Schema(description = "农户身份证号", requiredMode = Schema.RequiredMode.REQUIRED)
			@NotBlank(message = "农户身份证号不能为空") //不能为空也不能为null
			@Length(message = "农户身份证号必须{max}位数据", min = 18, max = 18)
			private String idcard;
			//@NotBlank(message = "农户身份证号不能为空") //不能为空也不能为null
			//@Length(message = "农户身份证号必须{max}位数据", min = 18, max = 18)
			private String idCard;

			/**
			* 种植面积
			@@ -79,17 +79,23 @@
			private Double area;

			/**
			* 用水方式
			*/
			@Schema(description = "用水方式", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
			private Long typeId;

			/**
			* 街道及门牌号
			*/
			@Schema(description = "街道+门牌号", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
			@Length(message = "地址不大于{max}字，不小于{min}字", min = 1, max = 50)
			@Length(message = "地址不大于{max}字，不小于{min}字", max = 50)
			private String address;

			/**
			* 备注信息
			*/
			@Schema(description = "备注", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
			@Length(message = "备注不大于{max}字，不小于{min}字", min = 1, max = 200)
			@Length(message = "备注不大于{max}字，不小于{min}字", max = 200)
			private String remarks;

			/**