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

cjl

2023-08-09 83e42707519f5e2d886618ea55c30e8c3ab381ac

 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