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

yanghui

2022-10-13 f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/ComActSocialMemberVO.java

@@ -86,6 +86,9 @@
    @ApiModelProperty(value = "所属组织")
    private String orgName;

    @ApiModelProperty(value = "年龄")
    private Integer age;

    /**
     * 用户id
     */