From 6cc2a1d726e1019079b6d3fa74599426a359c001 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 02 Nov 2021 14:55:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_

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

diff --git a/screen-api/src/main/java/com/moral/api/entity/CityAqi.java b/screen-api/src/main/java/com/moral/api/entity/CityAqi.java
index fc173c4..f76c3d5 100644
--- a/screen-api/src/main/java/com/moral/api/entity/CityAqi.java
+++ b/screen-api/src/main/java/com/moral/api/entity/CityAqi.java
@@ -24,7 +24,7 @@
     /**
      * ������id
      */
-    private String cityCode;
+    private Integer cityCode;
 
     /**
      * ������

--
Gitblit v1.8.0