Merge branch 'rcs_master' into ctu_conveyor

zhang

7 天以前 39efc87b3794f957aad73acf3a430b84e3a19b27

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/param/LocInitParam.java

@@ -26,4 +26,10 @@

    private Double bottom;

    private Integer compDirect;

    private Long locSts;

    private Long locType;

}