Merge remote-tracking branch 'origin/gzb' into wzl

src/views/schoolSection/applicationManage/applicationList.vue

@@ -1113,28 +1113,28 @@ export default {
                 align: "center"
               },
               {
-                title: "区域名称",
-                key: "regionName",
+                title: "设备名称",
+                key: "sn",
                 align: "center"
               },
               {
-                title: "设备总数",
-                key: "total",
+                title: "设备使用人",
+                key: "username",
                 align: "center"
               },
               {
-                title: "已安装设备数",
-                key: "installNum",
+                title: "设备型号",
+                key: "deviceModel",
                 align: "center"
               },
               {
-                title: "未安装设备总数",
-                key: "unInstallNum",
+                title: "Rom版本",
+                key: "romVersion",
                 align: "center"
               },
               {
-                title: "安装比例",
-                key: "installRate",
+                title: "操作时间",
+                key: "createtime",
                 align: "center"
               }
             ]