Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs

1

昨天 e596214d84efa77d0cf316563548f1b1d7643a37

 src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java

@@ -58,4 +58,9 @@
                ,findLocNoAttributeVo.getBoxType1(),findLocNoAttributeVo.getBoxType2(),findLocNoAttributeVo.getBoxType3()
                ,crnNo);
    }

    @Override
    public WrkMast selectWrkMast(Integer workNo, String barcode) {
        return this.baseMapper.selectWrkMast(workNo, barcode);
    }
}