From c386b102a2397d569131e3a459465ba84e2376be Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 21 Aug 2023 14:27:51 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

---
 screen-job/src/main/java/com/moral/api/entity/HistoryAqi.java |    4 +++-
 1 files changed, 3 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..f31e8c2 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
@@ -1,5 +1,7 @@
 package com.moral.api.entity;
 
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.io.Serializable;
 import java.util.Date;
@@ -24,7 +26,7 @@
     /**
      * ������code
      */
-    private String cityCode;
+    private String guid;
 
     /**
      * ������

--
Gitblit v1.8.0