Merge remote-tracking branch 'origin/master'

王佳豪

2021-05-17 757c62a51677d67a389690ee6a3131215dc8729e

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

@@ -12,7 +12,7 @@
public class LocAreaServiceImpl extends ServiceImpl<LocAreaMapper, LocArea> implements LocAreaService {

    @Override
    public List<LocArea> queryAllLocArea() {
       return baseMapper.queryAllLocArea();
    public List<LocArea> queryAllLocArea(String areaType) {
       return baseMapper.queryAllLocArea(areaType);
    }
}