Merge remote-tracking branch 'origin/master'

cuilei

5 天以前 8b6b7aa7e4f2ae6ec14514875b559aa6890f3b1e

 src/views/flowable/workflow/inboundOrder/InboundOrderHandle.vue

@@ -242,6 +242,11 @@
          dataIndex: 'toolModel'
        },
        {
          title:'库位号',
          align:"center",
          dataIndex: 'goodsShelvesId'
        },
        {
          title:'申请入库数量',
          align:"center",
          dataIndex: 'inStorageQuantity'