Merge branch 'master' of https://gitee.com/luxiaotao1123/xtywms

luxiaotao1123

2021-08-03 1ff0f95e1a2e10af8d356f797106f1e4b9ad873f

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