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

cl

2 天以前 f95a3c836f06078f41389051a9d1c01969a925cb

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

@@ -35,4 +35,6 @@
    // 目标站
    private Short staNo = 0;

    //高低库位
    private String locType1 = "-";
}