From 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 15:13:10 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComPbServiceTeamDTO.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComPbServiceTeamDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComPbServiceTeamDTO.java
index df0e8c3..101f7b5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComPbServiceTeamDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComPbServiceTeamDTO.java
@@ -1,12 +1,15 @@
package com.panzhihua.common.model.dtos.partybuilding;
+import java.util.Date;
+
+import javax.validation.constraints.NotBlank;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.validated.AddGroup;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
-import java.util.Date;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -22,20 +25,38 @@
private Long id;
@ApiModelProperty("姓名")
- @NotBlank(groups = AddGroup.class,message = "姓名不能为空")
+ @NotBlank(groups = AddGroup.class, message = "姓名不能为空")
private String name;
@ApiModelProperty("职位")
- @NotBlank(groups = AddGroup.class,message = "职位不能为空")
+ @NotBlank(groups = AddGroup.class, message = "职位不能为空")
private String job;
+ @ApiModelProperty("职位2")
+ private String jobTwo;
+
+ @ApiModelProperty("岗位职责")
+ @NotBlank(groups = AddGroup.class, message = "岗位职责不能为空")
+ private String jobResponsibilities;
+
@ApiModelProperty("照片")
- @NotBlank(groups = AddGroup.class,message = "照片不能为空")
+ @NotBlank(groups = AddGroup.class, message = "照片不能为空")
private String url;
+ @ApiModelProperty("电话")
+ @NotBlank(groups = AddGroup.class, message = "电话不能为空")
+ private String phone;
+
@ApiModelProperty("create_at")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date createAt;
@ApiModelProperty("社区id")
private Long communityId;
+
+ @ApiModelProperty(value = "区域编码", hidden = true)
+ private String areaCode;
+
+ @ApiModelProperty(value = "appid", hidden = true)
+ private String appid;
}
--
Gitblit v1.7.1