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

luxiaotao1123

2021-04-08 91f2cd5b0f832091f654cce926585d2f05cad114

 src/main/java/com/zy/asrs/service/LocAreaService.java

@@ -6,5 +6,5 @@
import java.util.List;

public interface LocAreaService extends IService<LocArea> {
    List<LocArea> queryAllLocArea ();
    List<LocArea> queryAllLocArea (String areaType);
}