Merge branch 'ctu_stable' of github.com:luxiaotao1123/rcs-flow into ctu_stable

luxiaotao1123

8 天以前 fd5b2fe041fe583307352d3120f422401e05745b

 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;

}