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

cjl

2023-08-30 2e0bf4423c235802791012e1fb0817d2c9156b2a

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

@@ -36,8 +36,7 @@
    /**
     * 数据
     */
//    private String value;
    private String json;
    private String value;


    @Override