Merge remote-tracking branch 'origin/master'

src/views/mes/baseDeviceType/index.vue

@@ -238,7 +238,10 @@ const data = reactive<PageData<BaseDeviceTypeForm, BaseDeviceTypeQuery>>({
 /*    ancestors: [
       { required: true, message: "祖级列表不能为空", trigger: "blur" }
     ],*/
-    categoryId: [
+    // categoryId: [
+    //   { required: true, message: "设备大类不能为空", trigger: "blur" }
+    // ],
+    deviceCategoryId:[
       { required: true, message: "设备大类不能为空", trigger: "blur" }
     ],
     activeFlag: [
@@ -357,6 +360,7 @@ type BaseOption = {
   deviceTypeName: string;
   children?: BaseOption[];
 }
+
 const baseOptions = ref<BaseDeviceTypeVO[]>([]);
 const getTreeselect = async () => {
   const res = await getBaseDeviceTypeList(null);