From 43c631ad573535f4434caf19423824d4bd3f8ca7 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 19 Jul 2023 13:09:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
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