Merge branch 'rcs_master' into ctu_conveyor

zhang

22 小时以前 8dfcfee645b874b785e39bc33c578ba4e1e9a38b

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/TaskPosDto.java

@@ -19,6 +19,8 @@

    private Long codeId;

    private Long segId;

    private Double[] xy = new Double[2];

    private PosType posType;