Merge remote-tracking branch 'origin/master'

src/views/inventory/DeviceReceiveOrderModify.vue

@@ -180,7 +180,7 @@
               <el-input :disabled="scope.$index !== currentIndex" v-model="scope.row.remark"></el-input>
             </template>
           </el-table-column>
-          <el-table-column label="生产日期(yyMMdd)" prop="produceDate"></el-table-column>
+          <el-table-column label="生产日期(yyMMdd)" prop="productionDate"></el-table-column>
           <el-table-column label="失效日期(yyMMdd)" prop="expireDate"
                            show-overflow-tooltip></el-table-column>
           <el-table-column label="注册/备案凭证号" prop="zczbhhzbapzbh"