From 4a4db8924da0782d0b698f7585ad6b0577bdca2d Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 06 Sep 2023 10:09:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl

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

diff --git a/screen-job/src/main/java/com/moral/api/entity/CityWeather.java b/screen-job/src/main/java/com/moral/api/entity/CityWeather.java
index dbe0832..fadc378 100644
--- a/screen-job/src/main/java/com/moral/api/entity/CityWeather.java
+++ b/screen-job/src/main/java/com/moral/api/entity/CityWeather.java
@@ -24,7 +24,7 @@
     /**
      * ������code
      */
-    private String cityCode;
+    private Integer cityCode;
 
     /**
      * ������

--
Gitblit v1.8.0