Merge branch 'master' into docker_package

renren-admin/src/main/java/io/renren/common/controller/AbilityCenterControllerV2.java

@@ -3,11 +3,9 @@ package io.renren.common.controller;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import io.renren.common.annotation.LogOperation;
-import io.renren.common.constant.Constant;
 import io.renren.common.dto.AuditingBaseDTO;
 import io.renren.common.page.PageData;
 import io.renren.common.utils.CodeGenerationUtils;
-import io.renren.common.utils.DateUtils;
 import io.renren.common.utils.Result;
 import io.renren.common.validator.ValidatorUtils;
 import io.renren.common.validator.group.AddGroup;

renren-admin/src/main/java/io/renren/modules/processForm/service/TAbilityApplicationService.java

@@ -1,7 +1,6 @@
 package io.renren.modules.processForm.service;
 
 import io.renren.common.service.CrudService;
-import io.renren.common.utils.Result;
 import io.renren.modules.processForm.dto.TAbilityApplicationDTO;
 import io.renren.modules.processForm.entity.TAbilityApplicationEntity;
 
@@ -55,6 +54,7 @@ public interface TAbilityApplicationService extends CrudService<TAbilityApplicat
 
     /**
      * 获取申请能力部门列表
+     *
      * @return
      */
     Object getApplyDeptList();

renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java

@@ -8,7 +8,6 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.cache.annotation.Cacheable;
 
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 

renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java

@@ -152,6 +152,7 @@ public interface ResourceService extends CrudService<ResourceEntity, ResourceDTO
 
     /**
      * 无需分页
+     *
      * @param params
      * @return
      */

renren-admin/src/main/java/io/renren/modules/resourceMountApply/dao/TResourceMountApplyDao.java

@@ -4,9 +4,7 @@ import io.renren.common.dao.BaseDao;
 import io.renren.modules.resourceMountApply.entity.TResourceMountApplyEntity;
 import org.apache.ibatis.annotations.Mapper;
 
-import java.util.Collection;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 资源挂载申请表单

renren-admin/src/main/java/io/renren/modules/security/oauth2/Oauth2Filter.java

@@ -1,7 +1,6 @@
 package io.renren.modules.security.oauth2;
 
 import cn.hutool.core.date.DateField;
-import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.net.url.UrlBuilder;
 import cn.hutool.core.util.CharsetUtil;
@@ -15,7 +14,6 @@ import io.renren.modules.security.service.SysUserTokenService;
 import io.renren.modules.security.user.SecurityUser;
 import io.renren.modules.sys.dao.SysUserDao;
 import io.renren.modules.sys.entity.SysUserEntity;
-import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpStatus;
 import org.apache.shiro.authc.AuthenticationException;
@@ -34,7 +32,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.Map;
 
 /**

renren-admin/src/main/java/io/renren/modules/sys/entity/SysRoleUserEntity.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.renren.common.entity.BaseEntity;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

renren-admin/src/main/java/io/renren/modules/sysnoticemanagement/dto/SysNoticeManagementDTO.java

@@ -1,7 +1,6 @@
 package io.renren.modules.sysnoticemanagement.dto;
 
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;

renren-admin/src/main/java/io/renren/modules/sysnoticemanagement/entity/SysNoticeManagementEntity.java

@@ -1,8 +1,11 @@
 package io.renren.modules.sysnoticemanagement.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import com.baomidou.mybatisplus.annotation.*;
 
 import java.util.Date;