From 547b51661fefe8d7b88640b29a60db8874f5efac Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 14 Mar 2022 16:27:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

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

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

--
Gitblit v1.8.0