Merge branch 'feature/ci-test13' of duanxiaoduan/tmr-group-admin into develop

.env.production

@@ -2,7 +2,7 @@
 ENV = 'production'
 
 # base api
-# 正式线
+# 正式线 
 # VUE_APP_BASE_API = ':8081/'
 # VUE_APP_BASE_API = '/'
 VUE_APP_BASE_API = 'http://kpt8081.kptyun.com/'

src/views/statisticalAnalysis/feedingEfficiency/index.vue

@@ -39,9 +39,9 @@
             class="elTable table-fixed"
             :max-height="myHeight"
           >
-            <el-table-column v-if="tab.isFormulaName" sortable label="配方模板" min-width="70px" align="center" prop="配方模板" />
+            <el-table-column v-if="tab.isFormulaName" sortable label="配方模板" min-width="70px" align="center" prop="feed_formula_name"" />
             <el-table-column v-if="tab.isHouseName" sortable label="栏舍" min-width="70px" align="center" prop="bar_name" />
-            <el-table-column v-if="tab.isHouseName" sortable label="配方模板" min-width="70px" align="center" prop="配方模板" />
+            <el-table-column v-if="tab.isHouseName" sortable label="配方模板" min-width="70px" align="center" prop="feed_formula_name" />
             <el-table-column v-if="tab.isLivestockType" sortable label="牲畜类别" min-width="70px" align="center" prop="牲畜类别" />
             <el-table-column sortable label="实际牛头数" min-width="60px" align="center" prop="actual_number_of_cattle" />
             <el-table-column sortable label="应混料量（kg）" min-width="60px" align="center" prop="amount_to_be_mixed" />