diff --git a/.env.development b/.env.development
index 6b45548..4c056ae 100644
--- a/.env.development
+++ b/.env.development
@@ -13,15 +13,9 @@ VITE_APP_BASE_API = 'http://192.168.110.180:8899'
 # VITE_APP_BASE_API = 'http://192.168.110.213:8899'
 # 朱银
 # VITE_APP_BASE_API = 'http://192.168.110.149:8899'
-<<<<<<< HEAD
 #曾涛
-VITE_APP_BASE_API = 'http://192.168.110.171:8899'
+# VITE_APP_BASE_API = 'http://192.168.110.171:8899'
 
-=======
-#屈展航
-# VITE_APP_BASE_API = 'http://192.168.110.210:8899'
-# VITE_APP_BASE_API = 'http://192.168.110.209:8899'
->>>>>>> 4d0845ee536a00e15be67ab1e951c803060ae609
 # 无人机接口地址
 
 VITE_APP_BASE_DRONE_API = 'http://58.17.134.85:9512'
diff --git a/src/views/out/constructionValue/index.vue b/src/views/out/constructionValue/index.vue
index 5d49049..82af6af 100644
--- a/src/views/out/constructionValue/index.vue
+++ b/src/views/out/constructionValue/index.vue
@@ -47,7 +47,8 @@
           <el-table-column label="人工填报数量" align="center" prop="artificialNum" />
           <el-table-column label="无人机识别数量" align="center" prop="uavNum" />
           <el-table-column label="确认数量" align="center" prop="confirmNum" />
-          <el-table-column label="产值" align="center" prop="outValue" />
+          <el-table-column label="对乙产值" align="center" prop="outValue" />
+          <el-table-column label="对甲产值" align="center" prop="ownerValue" />
           <el-table-column label="流程状态" align="center" prop="status">
             <template #default="scope">
               <dict-tag :options="wf_business_status" :value="scope.row.auditStatus" />