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

wuqiping

2021-06-09 f342a0d88b2a7168f794d0cf545d16a3138acb6d

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

@@ -22,4 +22,10 @@
    * 使用List<sysDictType>接收
    * */
    public static final String DICT_TYPE_KEY = "dict_type";

    /*
    * 因子 redis中的key
    * 使用Map<Integer,Sensor>接收
    * */
    public static final String SENSOR_KEY = "sensor";
}