Merge remote-tracking branch 'origin/master'

huanghongfa

2021-12-09 9576bebcacea938771f6f5b51d958e6a4ac59df6

 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;

}