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

huanghongfa

2021-10-09 2b72e2b592f642b23e5c78a3ffdab3fc1fafba11

 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;