From a69578ed877252e70d45d4753258b3d7b6937606 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:24:34 +0800
Subject: [PATCH] a
---
server/src/main/java/doumeemes/service/system/impl/SystemUserServiceImpl.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/system/impl/SystemUserServiceImpl.java b/server/src/main/java/doumeemes/service/system/impl/SystemUserServiceImpl.java
index a3c21da..87cac8d 100644
--- a/server/src/main/java/doumeemes/service/system/impl/SystemUserServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/system/impl/SystemUserServiceImpl.java
@@ -4,7 +4,10 @@
import com.github.pagehelper.PageInfo;
import doumeemes.core.model.PageData;
import doumeemes.core.model.PageWrap;
+<<<<<<< HEAD
import doumeemes.core.utils.DateUtil;
+=======
+>>>>>>> 1.0.3
import doumeemes.dao.ext.dto.ActivityLoginDTO;
import doumeemes.dao.ext.dto.CompanyLoginDTO;
import doumeemes.dao.ext.vo.ActivityLoginVO;
@@ -198,9 +201,12 @@
@Override
public List<ActivityLoginVO> activityLoginVOList(ActivityLoginDTO activityLoginDTO) {
+<<<<<<< HEAD
if(StringUtils.isNotBlank(activityLoginDTO.getEndDate())){
activityLoginDTO.setEndDate(DateUtil.afterDate(activityLoginDTO.getEndDate(),1));
}
+=======
+>>>>>>> 1.0.3
return systemUserMapper.activityLoginVOList(activityLoginDTO);
}
--
Gitblit v1.9.3