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

huanghongfa

2021-09-13 47b20dbb8f81f2a3ac113a7e209a8b4d1cb0146d

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

@@ -14,7 +14,6 @@
@ApiModel("负责人")
public class ActivityManagerVO {


    @ApiModelProperty("负责人id")
    private Long managerId;