Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

gaoluyang

6 小时以前 cb9cd49627b65a4c0e137e08063271a8cefe1826

 src/packages/@core/ui-kit/form-ui/src/config.ts

@@ -15,8 +15,8 @@
  VbenInputPassword,
  VbenPinInput,
  VbenSelect,
} from '..\..\shadcn-ui\src';
import { globalShareState } from '..\..\..\base\shared\src\global-state';
} from '../../shadcn-ui/src';
import { globalShareState } from '../../../base/shared/src/global-state';

import { defineRule } from 'vee-validate';