Merge branch 'feature/merge1115' of Epans/modernDairy into master

src/views/custom/contractManagement/index.vue

@@ -136,6 +136,7 @@
             <el-table-column label="计量单位" min-width="120px" align="center" prop="unit" />
             <el-table-column label="计划量" sortable min-width="120px" align="center" prop="planAmount" />
             <el-table-column label="单价" sortable min-width="120px" align="center" prop="price" />
+            <el-table-column label="备注" sortable min-width="120px" align="center" prop="remark" />
             <!-- <el-table-column label="使用周期" min-width="120px" align="center" prop="lifeCycle" />
             <el-table-column label="合同差异项" min-width="120px" align="center" prop="contractVarianceItem" /> -->
           </el-table>