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

tangxiaobao

2021-07-22 1627ec87769c53f3f7bc69eaf75cc5b0a38ff112

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

@@ -29,6 +29,9 @@

    @ApiModelProperty("职位")
    private String job;

    @ApiModelProperty("职位2")
    private String jobTwo;
    
    @ApiModelProperty("岗位职责")
    private String jobResponsibilities;