Merge branch 'master' of http://120.26.64.82:3000/BFFE/SZYGM1.0

src/views/systemSettings/queryTemplate/queryTemplateAdd.vue

@@ -50,12 +50,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item
-              label="服务名称"
-              prop="serviceID"
-              size="default"
-              :rules="formRules.isNotNull"
-            >
+            <el-form-item label="服务名称" size="default">
               <el-select
                 v-model="ruleForm.serviceID"
                 placeholder="请选择"

src/views/systemSettings/queryTemplate/queryTemplateEdit.vue

@@ -50,12 +50,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item
-              label="服务名称"
-              prop="serviceID"
-              size="default"
-              :rules="formRules.isNotNull"
-            >
+            <el-form-item label="服务名称" size="default">
               <el-select
                 v-model="ruleForm.serviceID"
                 placeholder="请选择"