Merge branch 'local_20221010' into haucheng_panzhihua

yanghui

2022-10-11 5265328520f66ae8bd3b63ba51cd0322f81a0dfb

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

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

    /**