Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-07-15 8a1e35934f5ad3e3febe6168e8eb990a0cd9cadb

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

@@ -64,5 +64,10 @@
    * */
    public static final String UNIT_CONVERSION = "unit_conversion";

    /*
     * redis中5分钟数据key
     * */
    public static final String DATA_FIVE_MINUTES = "data_five_minutes";


}