Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into feature-bieao

# Conflicts:
#	lift-business-service/src/main/java/cn/com/ty/lift/business/project/service/ProjectService.java

lift-business-service/src/main/java/cn/com/ty/lift/business/project/service/ProjectService.java

@@ -15,19 +15,17 @@ import cn.com.ty.lift.business.project.dao.mapper.ProjectMapper;
 import cn.com.ty.lift.common.base.ExportRequest;
 import cn.com.ty.lift.common.export.ExportUtils;
 import cn.com.ty.lift.common.utils.DateUtils;
-import cn.com.xwy.boot.service.impl.BaseServiceImpl;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import cn.hutool.core.util.ObjectUtil;
-import cn.com.xwy.boot.web.dto.RestResponse;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
@@ -44,7 +42,7 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service
-public class ProjectService extends BaseServiceImpl<ProjectMapper,Project> {
+public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
 
     @Resource
     private ProjectMapper projectMapper;