Merge remote-tracking branch 'origin/master'

sgj

20 小时以前 ef7cde2fb1f44de1ffa8b961ee1732fb327e1cd4

 fzzy-igdss-core/src/main/java/com/fzzy/igds/constant/RedisConst.java

@@ -85,6 +85,11 @@
    public static final String KEY_DEVICE_SER_LIST = "SER_LIST";

    /**
     * 网关KEY
     */
    public static final String KEY_GATEWAY_SER_LIST = "GATEWAY_LIST";

    /**
     * 设备列表
     */
    public static final String KEY_DEVICE_LIST = "DEVICE_LIST";