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

zc

昨天 aee6386344123c250b3ddfa3efa9a7e3ff8f6cbb

 src/main/java/com/zy/asrs/domain/vo/ShuttleDataVo.java

@@ -17,6 +17,6 @@

    private Integer lev;

    private String pakMk;
    private Boolean pakMk;

}