暂存修改

zhongrj

2022-07-29 c860f3c9813482d43f9eccd42af07d08dea56af8

暂存修改

 src/views/farmplant/detection.vue

@@ -1,8 +1,4 @@
<<<<<<< HEAD
  <template>
=======
<template>
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
  <div>
    <el-dialog
      title="检测报告"
@@ -47,13 +43,6 @@
  </el-dialog>
</div>
</template>
<<<<<<< HEAD


=======
 
 
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356
<script>
import { getDetail, getList, update, remove, save } from "@/api/farm/farmPaper";
import { mapGetters } from "vuex";
@@ -312,12 +301,6 @@
  },
};
</script>
<<<<<<< HEAD

<style>
</style>
=======
 
<style>
</style>
>>>>>>> adf4c52344cf6f0ea16d1f01410258648c9f5356