From 86c06b0f6f30099b436814ab223121aa8239081a Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 16 Sep 2021 10:14:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 screen-job/src/main/java/com/moral/api/entity/HistoryAqi.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/screen-job/src/main/java/com/moral/api/entity/HistoryAqi.java b/screen-job/src/main/java/com/moral/api/entity/HistoryAqi.java
index 95327da..14998b6 100644
--- a/screen-job/src/main/java/com/moral/api/entity/HistoryAqi.java
+++ b/screen-job/src/main/java/com/moral/api/entity/HistoryAqi.java
@@ -24,7 +24,7 @@
     /**
      * ������code
      */
-    private String cityCode;
+    private String guid;
 
     /**
      * ������

--
Gitblit v1.8.0