Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-09-29 4c80d2017a3b88b9ad55f28c3b87fd96eb67bcb2

 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
@@ -71,4 +71,5 @@

    private String password;

    private String idCard;
}