From 090f4dac98c412c5734a706b853724e2d2accda4 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 25 Oct 2023 15:17:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-api/src/main/java/com/moral/api/pojo/dto/cityAQI/ConcentrationAndPercent.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/pojo/dto/cityAQI/ConcentrationAndPercent.java b/screen-api/src/main/java/com/moral/api/pojo/dto/cityAQI/ConcentrationAndPercent.java
index ea01fca..3f3dbff 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/dto/cityAQI/ConcentrationAndPercent.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/dto/cityAQI/ConcentrationAndPercent.java
@@ -1,5 +1,6 @@
package com.moral.api.pojo.dto.cityAQI;
+import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.Data;
/**
@@ -10,6 +11,7 @@
* @Version TODO
**/
@Data
+@JsonInclude(value = JsonInclude.Include.NON_NULL)
public class ConcentrationAndPercent {
/*
@@ -18,6 +20,11 @@
private String concentration;
/*
+ * ���������������
+ * */
+ private String compareConcentration;
+
+ /*
* ������/������
* */
private String percent;
--
Gitblit v1.8.0