Merge remote-tracking branch 'remotes/origin/sanshuohuitang_dev' into huach...

manailin

2022-09-24 9030449dcf90628b7d7b28911c7843c97f04c103

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

@@ -24,7 +24,7 @@
    /**
     * 主键id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long id;

    /**