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

jinpengyong

2022-01-20 2ab1de34b119570c99946ab3e480e9d31745518a

 screen-job/src/main/java/com/moral/api/entity/HistoryAqi.java

@@ -24,7 +24,7 @@
    /**
     * 城市code
     */
    private String cityCode;
    private String guid;

    /**
     * 时间