Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

yuan

4 小时以前 0ce4aec75d87508cece9437be816e057ea433765

 src/views/inventoryManagement/stockManagement/Record.vue

@@ -104,11 +104,11 @@
          prop="unQualifiedLockedQuantity"
          show-overflow-tooltip
        /> -->
<!--        <el-table-column
       <el-table-column
          label="库存预警数量"
          prop="warnNum"
          show-overflow-tooltip
        />-->
        />
        <el-table-column label="备注" prop="remark" show-overflow-tooltip />
        <el-table-column
          label="最近更新时间"