Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-26 8da7ca5f5a5466c76b0d0abe23c7935e13e09136

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

@@ -30,8 +30,8 @@

    private static final long serialVersionUID = 905771115750112478L;

    @TableId(type = IdType.AUTO)
    private Integer id;
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;

    /**
     * 用户id
@@ -69,4 +69,7 @@
    @ApiModelProperty(value = "照片")
    private String url;

    private String password;

    private String idCard;
}