Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-10-10 6651bb95348b21a446e6b54a501a2aec521c5243

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/ComActFourMember.java

@@ -28,7 +28,7 @@

    private static final long serialVersionUID = 905771115750112478L;

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

    /**
@@ -69,4 +69,6 @@

    private String password;

    private String idCard;

}