Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs

18516761980

2022-06-16 8b52cb78c70877c9d8689bfcdb49461995cf939a

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

@@ -47,4 +47,6 @@
     * @return
     */
    LocMast queryFreeLocMastExceptFirst(Integer row, Short locType1, Short locType2, Short locType3);

    public List<LocMast> queryShallowLocFMast();
}