From 33b9d2c203a9998272088ecdf43a15dd53669967 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Thu, 28 Mar 2024 15:51:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-job/src/main/java/com/moral/api/service/CityWeatherService.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/service/CityWeatherService.java b/screen-job/src/main/java/com/moral/api/service/CityWeatherService.java
index bc57b3e..290158f 100644
--- a/screen-job/src/main/java/com/moral/api/service/CityWeatherService.java
+++ b/screen-job/src/main/java/com/moral/api/service/CityWeatherService.java
@@ -1,5 +1,7 @@
package com.moral.api.service;
+import java.util.List;
+
import com.moral.api.entity.CityWeather;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -15,14 +17,17 @@
//������������������������insert
void insertCityWeather();
-
+
/**
- *@Description: ������city_code���time������������
- *@Param: [cityCode, time]
- *@return: com.moral.api.entity.CityWeather
- *@Author: lizijie
- *@Date: 2021/10/14 16:52
+ * @Description: ������city_code���time������������
+ * @Param: [cityCode, time]
+ * @return: com.moral.api.entity.CityWeather
+ * @Author: lizijie
+ * @Date: 2021/10/14 16:52
**/
- CityWeather getDataByCityCodeAndTime(String cityCode,String time);
+ CityWeather getDataByCityCodeAndTime(String cityCode, String time);
+
+ //������������city_weather������
+ List<CityWeather> getCityWeather();
}
--
Gitblit v1.8.0