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

huanghongfa

2021-09-26 a1488b8f2dfe014d3fa8badadd74bdee41d4bb66

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActSocialOrg.java

@@ -249,4 +249,6 @@
    @ApiModelProperty(value = "登录用户id")
    private Long userId;

    private String password;

}