From 1b9a01bf5000714b08a75a50dd1f5f3eab65d888 Mon Sep 17 00:00:00 2001 From: nickchange <126672920+nickchange@users.noreply.github.com> Date: 星期五, 08 十二月 2023 17:18:38 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteBookingServiceImpl.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteBookingServiceImpl.java b/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteBookingServiceImpl.java index 9321554..02d5064 100644 --- a/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteBookingServiceImpl.java +++ b/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteBookingServiceImpl.java @@ -21,9 +21,10 @@ public class SiteBookingServiceImpl extends ServiceImpl<SiteBookingMapper, SiteBooking> implements ISiteBookingService { @Autowired private SiteBookingMapper siteBookingMapper; + @Override public List<BillingRequestOfType> queryDatas(Integer appUserId, String monthStart, String monthEnd) { - return this.baseMapper.queryDatas(appUserId,monthStart,monthEnd); + return this.baseMapper.queryDatas(appUserId, monthStart, monthEnd); } @Override @@ -35,7 +36,7 @@ ETime = query.getTime().split(" - ")[1] + " 23:59:59"; } - return siteBookingMapper.listAll(query,STime,ETime,query.getAmount()); + return siteBookingMapper.listAll(query, STime, ETime, query.getAmount()); } @Override -- Gitblit v1.7.1