Merge branch 'rcs_master' into ctu_conveyor

zhang

1 天以前 8dfcfee645b874b785e39bc33c578ba4e1e9a38b

 zy-acs-manager/src/main/java/com/zy/acs/manager/common/config/UplinkProperties.java

@@ -32,6 +32,8 @@

    private Integer port;

    private String url;

    // millisecond
    private Integer timeout = 60 * 1000;