From 1e52bbcb9f5fadfcbbeb60aac0fe421a64869f6b Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Wed, 10 Jul 2024 14:30:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/app/controller/app/AppUserMoneyController.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/sqx/modules/app/controller/app/AppUserMoneyController.java b/src/main/java/com/sqx/modules/app/controller/app/AppUserMoneyController.java
index 03367ba..1691cb9 100644
--- a/src/main/java/com/sqx/modules/app/controller/app/AppUserMoneyController.java
+++ b/src/main/java/com/sqx/modules/app/controller/app/AppUserMoneyController.java
@@ -170,7 +170,7 @@ public class AppUserMoneyController {
             period.setFundType(1);
             period = PeriodUtil.calculationPeriod(period);
             startTime = sdf.format(period.getStartFundData());
-            endTime = sdf.format(period.getEndFundData());
+            endTime = sdf.format(period.getEndFundData())+" 23:59:59";
         }else if(fundType == 3){//当月
             Period period = new Period();
             period.setArtificerId(artificer.getArtificerId()+"");
@@ -178,7 +178,7 @@ public class AppUserMoneyController {
             period.setFundType(3);
             period = PeriodUtil.calculationPeriod(period);
             startTime = sdf.format(period.getStartFundData());
-            endTime = sdf.format(period.getEndFundData());
+            endTime = sdf.format(period.getEndFundData())+" 23:59:59";
         }
 
         if(page == null){page = 1L;}