Merge branches 'dev' and 'master' of https://gitee.com/luxiaotao1123/xtywms...

luxiaotao1123

2021-04-08 91f2cd5b0f832091f654cce926585d2f05cad114

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

@@ -46,8 +46,8 @@
    }

    @Override
    public List<LocNormal> pdaLocNormalQuery(String matnr, String warehouse) {
       return baseMapper.pdaLocNormalQuery(matnr, warehouse);
    public List<LocNormal> pdaLocNormalQuery(String matnr, String warehouse, String billNo) {
       return baseMapper.pdaLocNormalQuery(matnr, warehouse, billNo);
    }

    @Override