Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/partybuilding/ComPbServiceTeamDTO.java

@@ -1,13 +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
@@ -23,26 +25,26 @@
    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 = "岗位职责不能为空")
    @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 = "电话不能为空")
    @NotBlank(groups = AddGroup.class, message = "电话不能为空")
    private String phone;

    @ApiModelProperty("create_at")