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

gaoluyang

2 天以前 7a5c5250b66cc6faffbcac9e192073473c50f79f

 src/views/mes/process-design/template/data.ts

@@ -2,8 +2,8 @@
import type { VxeTableGridOptions } from "#/adapter/vxe-table";
import type { MesPdTemplateApi } from "#/api/mes/pro/processdesign/template";

import { DICT_TYPE } from "../../../../packages/constants/src";
import { getDictOptions } from "../../../../packages/effects/hooks/src";
import { DICT_TYPE } from "@vben/constants";
import { getDictOptions } from "@vben/hooks";

import { z } from "#/adapter/form";