From af0ce5be0e5e78bc2a4ffe962af636bc3d14b99e Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期二, 08 十一月 2022 17:50:41 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/service/impl/HomeStatisticsImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/HomeStatisticsImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/HomeStatisticsImpl.java
index 94c0c61..4706a94 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/HomeStatisticsImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/HomeStatisticsImpl.java
@@ -81,7 +81,7 @@
}
@Override
- public int reversionRate(String state, String isTimeout) {
+ public String reversionRate(String state, String isTimeout) {
return baseMapper.reversionRate(state,isTimeout);
}
--
Gitblit v1.7.1