Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

lidongdong

2023-01-30 63c985f072826e7c82f51b0f415454a066fd8c56

 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;

    /**