Merge branch 'rcs_master' into ctu_conveyor

zhang

16 小时以前 8dfcfee645b874b785e39bc33c578ba4e1e9a38b

 zy-acs-manager/src/main/java/com/zy/acs/manager/common/domain/TaskDto.java

@@ -18,6 +18,6 @@

    private String destSta;

    private Integer priority = 1;
    private Integer priority;

}