Merge branch 'local_20221024' into haucheng_panzhihua

yanghui

2022-11-01 84bf62e86220ec8c1f5672666f1fbaf4618f55a9

 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;

    /**