From 64b432916af9c9218ab3f3eca614e26c542142ae Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 07 十一月 2023 15:47:13 +0800
Subject: [PATCH] bug
---
server/src/main/java/doumeemes/service/system/impl/SystemUserServiceImpl.java | 6 ------
1 files changed, 0 insertions(+), 6 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 87cac8d..a3c21da 100644
--- a/server/src/main/java/doumeemes/service/system/impl/SystemUserServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/system/impl/SystemUserServiceImpl.java
@@ -4,10 +4,7 @@
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;
@@ -201,12 +198,9 @@
@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