From 5586964c3e63f95c9e460a6a3d85d7dca408e096 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 18 Oct 2021 14:35:39 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

---
 screen-job/src/main/resources/mapper/HistoryAqiMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/screen-job/src/main/resources/mapper/HistoryAqiMapper.xml b/screen-job/src/main/resources/mapper/HistoryAqiMapper.xml
index 989a8f5..24404de 100644
--- a/screen-job/src/main/resources/mapper/HistoryAqiMapper.xml
+++ b/screen-job/src/main/resources/mapper/HistoryAqiMapper.xml
@@ -4,7 +4,7 @@
 
     <!-- ������������������������ -->
     <resultMap id="BaseResultMap" type="com.moral.api.entity.HistoryAqi">
-        <result column="city_code" property="cityCode"/>
+        <result column="guid" property="guid"/>
         <result column="time" property="time"/>
         <result column="value" property="value"/>
     </resultMap>

--
Gitblit v1.8.0