Merge branch 'local_20221014' into huacheng_test

yanghui

2022-10-17 a9a660a85f54911a76aefd1eb29a3af0c7b0e419

 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;

    /**