From c3811d01d1929a98a0f34f70ca187d82ee312dbb Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 03 十一月 2021 17:26:50 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyCommitteeVO.java | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyCommitteeVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyCommitteeVO.java
index 10cb7dc..5ec5882 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyCommitteeVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyCommitteeVO.java
@@ -20,19 +20,19 @@
@Data
@ApiModel("党委")
public class PartyCommitteeVO {
-
- @ApiModelProperty("主键")
+
+ @ApiModelProperty("主键")
private Long id;
@ApiModelProperty("电话")
- @NotBlank(groups = {AddGroup.class},message = "电话不能为空")
+ @NotBlank(groups = {AddGroup.class}, message = "电话不能为空")
private String phone;
-
+
@ApiModelProperty("是否注册")
private Integer isReg;
@ApiModelProperty("姓名")
- @NotBlank(groups = {AddGroup.class},message = "姓名不能为空")
+ @NotBlank(groups = {AddGroup.class}, message = "姓名不能为空")
private String name;
@ApiModelProperty("性别")
@@ -41,28 +41,31 @@
@ApiModelProperty("出生日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date birthTime;
-
+
@ApiModelProperty(value = "年龄")
private Integer age;
@ApiModelProperty("职位")
- @NotBlank(groups = {AddGroup.class},message = "电话不能为空")
+ @NotBlank(groups = {AddGroup.class}, message = "职位不能为空")
private String position;
+ @ApiModelProperty("职位2")
+ private String positionTwo;
+
@ApiModelProperty("岗位职责")
- @NotBlank(groups = {AddGroup.class},message = "岗位职责不能为空")
+ @NotBlank(groups = {AddGroup.class}, message = "岗位职责不能为空")
private String jobResponsibilities;
@ApiModelProperty("头像图片路径")
- @NotBlank(groups = {AddGroup.class},message = "头像不能为空")
+ @NotBlank(groups = {AddGroup.class}, message = "头像不能为空")
private String photoPath;
-
+
@ApiModelProperty("社区id")
private Long communityId;
-
+
@ApiModelProperty(value = "当前页数")
private Long pageNum;
-
+
@ApiModelProperty(value = "每页记录数")
private Long pageSize;
}
--
Gitblit v1.7.1