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

jinpengyong

2021-11-02 6cc2a1d726e1019079b6d3fa74599426a359c001

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

@@ -93,5 +93,10 @@
     * */
    public static final String CITY_AQI = "city_aqi";

    /*
     * redis中城市气象数据key
     * */
    public static final String CITY_WEATHER = "city_weather";


}