From c094aa1a63e711a632f24a17f21462778829ecc7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 10 Nov 2021 15:08:01 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-sys/src/main/java/com/xzx/gc/system/service/SysNewsService.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/gc-sys/src/main/java/com/xzx/gc/system/service/SysNewsService.java b/gc-sys/src/main/java/com/xzx/gc/system/service/SysNewsService.java
index 706f7f6..86f0234 100644
--- a/gc-sys/src/main/java/com/xzx/gc/system/service/SysNewsService.java
+++ b/gc-sys/src/main/java/com/xzx/gc/system/service/SysNewsService.java
@@ -7,9 +7,7 @@
import com.xzx.gc.entity.SysNews;
import com.xzx.gc.system.dto.*;
import com.xzx.gc.system.mapper.SysNewsMapper;
-import com.xzx.gc.system.vo.ApiNewsListVo;
-import com.xzx.gc.system.vo.SysNewsListVo;
-import com.xzx.gc.system.vo.ViewSysNewsVo;
+import com.xzx.gc.system.vo.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -79,4 +77,13 @@
public List<ApiNewsListVo> newsList(ApiNewsListDto apiNewsListDto) {
return sysNewsMapper.selectSysNews();
}
+
+ public ApiNewsInfoVo newsInfo(ApiNewsInfoDto apiNewsInfoDto) {
+ return sysNewsMapper.selectSysNewsInfo(apiNewsInfoDto);
+ }
+
+ public ApiSysPopupVo sysPopupInfo(ApiSysPopupDto apiSysPopupDto) {
+ String format = DateUtil.format(DateUtil.date(), "yyyy-MM-dd HH:mm:ss");
+ return sysNewsMapper.selectSysPopupInfo(format);
+ }
}
--
Gitblit v1.9.1