Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-10-09 28acbf00e1f3b431f0c52a201ea06638980b2bc2

 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;

    /**