Merge remote-tracking branch 'origin/dev' into dev_

jinpengyong

2021-09-10 c8aa05fd65cc788abc0f44494338b04993e3b4be

 screen-common/src/main/java/com/moral/constant/RedisConstants.java

@@ -78,5 +78,10 @@
     * */
    public static final String SPECIAL_DEVICE_INFO = "special_device_alarm_info";

    /*
     * redis中政府站点信息key
     * */
    public static final String GOV_MONITOR_POINT = "gov_monitor_point";


}