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

zjj

昨天 fa3e00c4d5e91613e3f2a1f2692cb68635d4ad2d

 src/main/java/com/zy/asrs/mapper/LocMastMapper.java

@@ -40,4 +40,6 @@
    List<LocMast> selectAreaEmpty(Short locType1,Integer crnNo);

    List<LocMast> selectAllLocNotEmpty(@Param("groupLoc") List<String> groupOuterLoc);

    LocMast getLocFByMatnr(String locNo);
}