Merge remote-tracking branch 'origin/master'

src/locales/en.ts

@@ -633,7 +633,9 @@ export default {
     expand:'Expand',
     close:'Close',
     save:'Save',
-    return:'Return'
+    return:'Return',
+    useProject:'useProject',
+    assetOwner:'assetOwnership'
   },
   file:{
     name:'FileName',

src/locales/zh-CN.ts

@@ -629,7 +629,9 @@ export default {
     expand:'一键展开',
     close:'一键收起',
     save:'保存',
-    return:'返回'
+    return:'返回',
+    useProject:'使用项目',
+    assetOwner:'资产归属'
   },
   file:{
     name:'文件名称',

src/views/pms/device/index.vue

@@ -154,6 +154,8 @@
           <el-table-column :label="t('deviceForm.brand')" align="center" prop="brandName" min-width="150"/>
           <el-table-column :label="t('deviceForm.model')" align="center" prop="model" min-width="170"/>
           <el-table-column :label="t('devicePerson.rp')" align="center" prop="chargeName" min-width="170"/>
+          <el-table-column :label="t('deviceForm.useProject')" align="center" prop="useProject" min-width="170"/>
+          <el-table-column :label="t('deviceForm.assetOwner')" align="center" prop="assetOwnership" min-width="170"/>
           <el-table-column :label="t('operationFill.operation')" align="center" min-width="180px" fixed="right">
             <template #default="scope">
               <el-button