From 10b5e4880762d517c857ae76b098b8749a261fb0 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 28 Sep 2023 14:20:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa

---
 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