Merge branch '3.x' of https://gitlab.yiring.com/basic/basic-vue-admin into dev

types/global.d.ts

@@ -25,7 +25,7 @@ declare global {
     // }
 
     // vue
-    declare type PropType<T> = VuePropType<T>
+    // declare type PropType<T> = VuePropType<T>
     declare type VueNode = VNodeChild | JSX.Element
 
     export type Writable<T> = {