Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

# Conflicts:
#	lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java

lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/inventory.vue

@@ -241,7 +241,7 @@
         <el-table-column prop="pcsn" label="批次" :min-width="flexWidth('pcsn',crud.data,'批次')" />
         <el-table-column prop="ivt_qty" label="库存数" :formatter="crud.formatNum3" />
         <el-table-column prop="qty_unit_name" label="计量单位" />
-        <el-table-column prop="instorage_time" label="入库时间" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="instorage_time" label="入库时间" min-width="140" show-overflow-tooltip />
         <el-table-column prop="product_area" label="生产区域">
           <template slot-scope="scope">
             {{ dict.label.product_area[scope.row.product_area] }}