Merge remote-tracking branch 'origin/prod' into prod

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue-project",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "private": true,
   "type": "module",
   "scripts": {

src/views/device/list/components/addDevice/index.vue

@@ -120,7 +120,7 @@ const deviceIdValidator = async (_rule: Rule, value: string) => {
     return Promise.reject(new Error('请输入设备ID'))
   }
   if (!/^[0-9a-fA-F]{12}$/.test(value)) {
-    return Promise.reject(new Error('设备ID不合法'))
+    return Promise.reject(new Error('设备ID不合法，须为12位十六进制字符（0-9，a-f或A-F）'))
   }
 
   return Promise.resolve()