From d910623a916587c074550564c8287294e2571495 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期四, 10 十一月 2022 16:54:51 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/CommonController.java | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/CommonController.java b/flower_city/src/main/java/com/dg/core/controller/CommonController.java
index 12fa193..bb24589 100644
--- a/flower_city/src/main/java/com/dg/core/controller/CommonController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/CommonController.java
@@ -151,7 +151,6 @@
return success("工作日");
}
-
/**
* 获取天气默认为攀枝花
*/
--
Gitblit v1.7.1