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

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/partybuilding/PartyCommitteeVO.java

@@ -27,7 +27,7 @@
    @ApiModelProperty("电话")
    @NotBlank(groups = {AddGroup.class},message = "电话不能为空")
    private String phone;

    
    @ApiModelProperty("是否注册")
    private Integer isReg;

@@ -46,9 +46,12 @@
    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 = "岗位职责不能为空")
    private String jobResponsibilities;