Merge branch 'master' into dev

src/components/NewCom/sysComponents/DevicesTable.vue

@@ -115,7 +115,7 @@ export default {
         const element = this.devices[i];
         devices += `设备品牌:${element.name || ""}\n设备型号:${
           element.type || ""
-        }\n数量:${1}\n序列号:${element.code || ""}\n`;
+        }\n数量:${element.num}\n序列号:${element.code || ""}\n`;
       }
       this.$emit("input", devices);
       this.$emit("change", devices);