Merge branch 'dev'

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-17 15:23:00
+ * @LastEditTime: 2023-10-26 15:04:32
 -->
 <template>
   <div class="from-clues">

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-17 13:29:39
+ * @LastEditTime: 2023-10-26 15:12:41
 -->
 <template>
   <div class="from-clues">
@@ -111,7 +111,7 @@
           label="权利性质">
         </el-table-column>
         <el-table-column
-          property="mj"
+          property="syqmj"
           label="使用权面积">
         </el-table-column>
         <el-table-column

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-06 17:03:59
+ * @LastEditTime: 2023-10-26 15:11:19
  */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -158,15 +158,15 @@ class datatwo extends filter {
         label: "权利性质",
       },
       {
-        prop: "mj",
+        prop: "syqmj",
         label: "宗地面积(㎡)",
       },
+      // {
+      //   prop: "qlsdfsmc",
+      //   label: "权利设定方式",
+      // },
       {
-        prop: "qlsdfsmc",
-        label: "权利设定方式",
-      },
-      {
-        prop: "ytmc",
+        prop: "qlytmc",
         label: "土地用途",
       },
       {