From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComPbServiceTeamDTO.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 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..b93aa2e 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,5 +1,6 @@
package com.panzhihua.common.model.dtos.partybuilding;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.validated.AddGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -29,11 +30,23 @@
@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 = "照片不能为空")
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")
--
Gitblit v1.7.1