Merge remote-tracking branch 'origin/fyxc_shuttle_wcs' into fyxc_shuttle_wcs

zc

昨天 aee6386344123c250b3ddfa3efa9a7e3ff8f6cbb

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

@@ -13,4 +13,5 @@
    public BasLiftOpt selectByDeviceWrk(String deviceWrk, Integer liftNo) {
        return this.baseMapper.selectByDeviceWrk(deviceWrk, liftNo);
    }

}