Merge branch 'master' into test

CeDo

2021-06-17 1c8ed0e3e18d6ed97879cb2925db914a9d487314

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

@@ -29,6 +29,9 @@
    @ApiModelProperty("职位")
    @NotBlank(groups = AddGroup.class,message = "职位不能为空")
    private String job;

    @ApiModelProperty("职位2")
    private String jobTwo;
    
    @ApiModelProperty("岗位职责")
    @NotBlank(groups = AddGroup.class,message = "岗位职责不能为空")