From 2a3d0885c11a73d41fb03c985f0032086cd8fa07 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期五, 08 三月 2024 17:42:58 +0800 Subject: [PATCH] 合并代码 --- cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java b/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java index c5a4e7b..898316d 100644 --- a/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java +++ b/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java @@ -70,6 +70,12 @@ @Autowired private TBackRecordService backRecordService; + @Autowired + private ISiteBookingService iSiteBookingService; + + @Autowired + private ISiteService siteService; + /** * 获取场地列表 @@ -155,10 +161,7 @@ } - @Autowired - private ISiteBookingService iSiteBookingService; - @Autowired - private ISiteService siteService; + /** * 获取场地预约日期数据 @@ -430,7 +433,6 @@ siteBooking.setState(1); siteBooking.setInsertTime(new Date()); - // 2.0 siteBooking.setNextName(reservationSite.getNextName()); siteBooking.setIsHalf(reservationSite.getIsHalf()); siteBooking.setHalfName(reservationSite.getHalfName()); -- Gitblit v1.7.1