Merge branch 'dev' of https://gitea.aiotagro.com/liupengcheng/admin-jxn-testing into dev

src/views/disease-resistance/disease-resistance.vue

@@ -45,7 +45,7 @@
         <el-table-column prop="farm" label="养殖场"></el-table-column>
         <el-table-column prop="number" label="标记编号"></el-table-column>
         <el-table-column prop="age" label="月龄"></el-table-column>
-        <el-table-column prop="result" label="监测结果"></el-table-column>
+        <el-table-column prop="result" label="检测结果"></el-table-column>
         <el-table-column label="详情">
           <template slot-scope="scope">
             <el-button