Merge remote-tracking branch 'origin/master'

# Conflicts:
#	niucloud/app/service/admin/sys/MenuService.php

admin/.env.development

@@ -1,5 +1,5 @@
 # api请求地址
-VITE_APP_BASE_URL='/adminapi/'
+VITE_APP_BASE_URL='http://146.56.228.75:20021/adminapi/'
 
 # 图片服务器地址
 VITE_IMG_DOMAIN=''

admin/.env.production

@@ -1,8 +1,8 @@
 # api请求地址
-VITE_APP_BASE_URL='/adminapi/'
+VITE_APP_BASE_URL='http://146.56.228.75:20021/adminapi/'
 
 # 图片服务器地址
-VITE_IMG_DOMAIN=''
+VITE_IMG_DOMAIN='http://146.56.228.75:20021'
 
 # 请求时header中token的参数名
 VITE_REQUEST_HEADER_TOKEN_KEY='token'

admin/auto-imports.d.ts

@@ -1,5 +1,5 @@
 // Generated by 'unplugin-auto-import'
 export {}
 declare global {
-  const ElNotification: typeof import('element-plus/es')['ElNotification']
+
 }

admin/components.d.ts

@@ -22,7 +22,6 @@ declare module '@vue/runtime-core' {
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElContainer: typeof import('element-plus/es')['ElContainer']
-    ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElDrawer: typeof import('element-plus/es')['ElDrawer']
     ElDropdown: typeof import('element-plus/es')['ElDropdown']

niucloud/README.md

@@ -1,4 +1,6 @@
-ThinkPHP 6.0
+ThinkPHP 6.0 123
+
+
 ===============
 
 > 运行环境要求PHP7.2+，兼容PHP8.1

niucloud/app/service/admin/sys/MenuService.php

@@ -200,6 +200,7 @@ class MenuService extends BaseAdminService
                 if ($status != 'all') {
                     $where[] = [ 'status', '=', $status ];
                 }
+
                 // 排除菜单
                 $delete_menu_addon = [];
                 $addon_loader = new DictLoader("Menu");