Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/views/board/equipment/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="container">
-    <div class="title1">监控单元</div>
+    <div class="title1">监控设备</div>
     <div class="centerImg"></div>
     <div class="title">监控单元</div>
     <div class="tree">

ruoyi-ui/src/views/business/deviceMode/editDeviceMode.vue

@@ -260,7 +260,7 @@
                 <el-input v-model="form.functionName" placeholder="请输入功能名称" maxlength="30"/>
               </el-form-item>
               <el-form-item label="标识符" prop="functionIdentifier">
-                <el-input v-model="form.functionIdentifier" placeholder="请输入标识符" maxlength="20"
+                <el-input v-model="form.functionIdentifier" placeholder="请输入标识符" maxlength="30"
                           :disabled="editDisable"/>
               </el-form-item>
 
@@ -428,7 +428,7 @@ export default {
           {required: true, message: "请输入标识符", trigger: "blur"},
           {
             pattern: /^[a-z][a-z0-9_]+$/,
-            message: "2-20个字符，由小写字母、数字或下划线组成，开头必须为小写字母",
+            message: "2-30个字符，由小写字母、数字或下划线组成，开头必须为小写字母",
             trigger: "blur"
           }
         ],