Merge remote-tracking branch 'origin/master'

王佳豪

2021-04-26 6704225b102b684e6ce4e88fa897414fac06c9f1

 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);
    }
}