升级springboot版本2.4.3、mybatis-plus版本2.4.2、druid版本1.2.4、hutool版本5.5.7以及修改代码版权时间

2021-02-23 00:23:19 +08:00
parent 2b11b49fe4
commit 013d4ff7d1
734 changed files with 743 additions and 746 deletions
--- a/pom.xml
+++ b/pom.xml
@ -28,7 +28,7 @@
    <parent>
        <groupId>org.springframework.boot</groupId>
        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.4.2</version>
+        <version>2.4.3</version>
    </parent>
    <properties>
@ -38,8 +38,8 @@
        <jedis.version>2.9.0</jedis.version>
        <swagger.version>2.9.2</swagger.version>
        <fastjson.version>1.2.75</fastjson.version>
-        <druid.version>1.1.10</druid.version>
+        <druid.version>1.2.4</druid.version>
-        <hutool.version>5.2.5</hutool.version>
+        <hutool.version>5.5.7</hutool.version>
        <commons-pool2.version>2.5.0</commons-pool2.version>
        <mapstruct.version>1.2.0.Final</mapstruct.version>
    </properties>
--- a/yshop-admin/src/main/java/co/yixiang/AppRun.java
+++ b/yshop-admin/src/main/java/co/yixiang/AppRun.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 * 注意：
 * 本软件为www.yixiang.co开发研制，未经购买不得使用
--- a/yshop-admin/src/main/java/co/yixiang/config/ConfigurerAdapter.java
+++ b/yshop-admin/src/main/java/co/yixiang/config/ConfigurerAdapter.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/config/DataScope.java
+++ b/yshop-admin/src/main/java/co/yixiang/config/DataScope.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/config/WebSocketConfig.java
+++ b/yshop-admin/src/main/java/co/yixiang/config/WebSocketConfig.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/config/thread/AsyncTaskExecutePool.java
+++ b/yshop-admin/src/main/java/co/yixiang/config/thread/AsyncTaskExecutePool.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/config/thread/AsyncTaskProperties.java
+++ b/yshop-admin/src/main/java/co/yixiang/config/thread/AsyncTaskProperties.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/config/thread/TheadFactoryName.java
+++ b/yshop-admin/src/main/java/co/yixiang/config/thread/TheadFactoryName.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/config/thread/ThreadPoolExecutorUtil.java
+++ b/yshop-admin/src/main/java/co/yixiang/config/thread/ThreadPoolExecutorUtil.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/handler/ApiErr.java
+++ b/yshop-admin/src/main/java/co/yixiang/handler/ApiErr.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/handler/ApiError.java
+++ b/yshop-admin/src/main/java/co/yixiang/handler/ApiError.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/handler/GlobalExceptionHandler.java
+++ b/yshop-admin/src/main/java/co/yixiang/handler/GlobalExceptionHandler.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/quartz/config/JobRunner.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/quartz/config/JobRunner.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/quartz/config/QuartzConfig.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/quartz/config/QuartzConfig.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/quartz/domain/QuartzJob.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/quartz/domain/QuartzJob.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/quartz/domain/QuartzLog.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/quartz/domain/QuartzLog.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/quartz/rest/QuartzJobController.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/quartz/rest/QuartzJobController.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/quartz/service/QuartzJobService.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/quartz/service/QuartzJobService.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/quartz/service/QuartzLogService.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/quartz/service/QuartzLogService.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/quartz/service/dto/QuartzJobDto.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/quartz/service/dto/QuartzJobDto.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/quartz/service/dto/QuartzJobQueryCriteria.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/quartz/service/dto/QuartzJobQueryCriteria.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/quartz/service/dto/QuartzLogDto.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/quartz/service/dto/QuartzLogDto.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/quartz/service/dto/QuartzLogQueryCriteria.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/quartz/service/dto/QuartzLogQueryCriteria.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/quartz/service/impl/QuartzJobServiceImpl.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/quartz/service/impl/QuartzJobServiceImpl.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
 package co.yixiang.modules.quartz.service.impl;
--- a/yshop-admin/src/main/java/co/yixiang/modules/quartz/service/impl/QuartzLogServiceImpl.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/quartz/service/impl/QuartzLogServiceImpl.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/quartz/service/mapper/QuartzJobMapper.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/quartz/service/mapper/QuartzJobMapper.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/quartz/service/mapper/QuartzLogMapper.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/quartz/service/mapper/QuartzLogMapper.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/quartz/task/TestTask.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/quartz/task/TestTask.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/quartz/utils/ExecutionJob.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/quartz/utils/ExecutionJob.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/quartz/utils/QuartzManage.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/quartz/utils/QuartzManage.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/quartz/utils/QuartzRunnable.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/quartz/utils/QuartzRunnable.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/security/config/SecurityConfig.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/security/config/SecurityConfig.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/security/config/SecurityProperties.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/security/config/SecurityProperties.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/security/rest/AuthController.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/security/rest/AuthController.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
 package co.yixiang.modules.security.rest;
--- a/yshop-admin/src/main/java/co/yixiang/modules/security/rest/OnlineController.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/security/rest/OnlineController.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/security/security/JwtAccessDeniedHandler.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/security/security/JwtAccessDeniedHandler.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/security/security/JwtAuthenticationEntryPoint.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/security/security/JwtAuthenticationEntryPoint.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/security/security/TokenConfigurer.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/security/security/TokenConfigurer.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/security/security/TokenFilter.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/security/security/TokenFilter.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
 package co.yixiang.modules.security.security;
--- a/yshop-admin/src/main/java/co/yixiang/modules/security/security/TokenProvider.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/security/security/TokenProvider.java
@ -1,5 +1,5 @@
 package co.yixiang.modules.security.security; /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 *//*
--- a/yshop-admin/src/main/java/co/yixiang/modules/security/security/vo/AuthUser.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/security/security/vo/AuthUser.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/security/security/vo/JwtUser.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/security/security/vo/JwtUser.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/security/service/OnlineUserService.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/security/service/OnlineUserService.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/security/service/UserDetailsServiceImpl.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/security/service/UserDetailsServiceImpl.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/domain/Dept.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/domain/Dept.java
@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018-2020
+* Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 * 注意：
 * 本软件为www.yixiang.co开发研制，未经购买不得使用
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/domain/Dict.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/domain/Dict.java
@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018-2020
+* Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 * 注意：
 * 本软件为www.yixiang.co开发研制，未经购买不得使用
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/domain/DictDetail.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/domain/DictDetail.java
@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018-2020
+* Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 * 注意：
 * 本软件为www.yixiang.co开发研制，未经购买不得使用
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/domain/Job.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/domain/Job.java
@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018-2020
+* Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 * 注意：
 * 本软件为www.yixiang.co开发研制，未经购买不得使用
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/domain/Menu.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/domain/Menu.java
@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018-2020
+* Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 * 注意：
 * 本软件为www.yixiang.co开发研制，未经购买不得使用
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/domain/Role.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/domain/Role.java
@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018-2020
+* Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 * 注意：
 * 本软件为www.yixiang.co开发研制，未经购买不得使用
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/domain/RolesDepts.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/domain/RolesDepts.java
@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018-2020
+* Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 * 注意：
 * 本软件为www.yixiang.co开发研制，未经购买不得使用
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/domain/RolesMenus.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/domain/RolesMenus.java
@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018-2020
+* Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 * 注意：
 * 本软件为www.yixiang.co开发研制，未经购买不得使用
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/domain/User.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/domain/User.java
@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018-2020
+* Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 * 注意：
 * 本软件为www.yixiang.co开发研制，未经购买不得使用
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/domain/UserAvatar.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/domain/UserAvatar.java
@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018-2020
+* Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 * 注意：
 * 本软件为www.yixiang.co开发研制，未经购买不得使用
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/domain/UsersRoles.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/domain/UsersRoles.java
@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018-2020
+* Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 * 注意：
 * 本软件为www.yixiang.co开发研制，未经购买不得使用
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/domain/vo/MenuMetaVo.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/domain/vo/MenuMetaVo.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/domain/vo/MenuVo.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/domain/vo/MenuVo.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/domain/vo/UserPassVo.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/domain/vo/UserPassVo.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/rest/DeptController.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/rest/DeptController.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/rest/DictController.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/rest/DictController.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/rest/DictDetailController.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/rest/DictDetailController.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/rest/JobController.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/rest/JobController.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/rest/MenuController.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/rest/MenuController.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/rest/RoleController.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/rest/RoleController.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/rest/SysUserController.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/rest/SysUserController.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/DeptService.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/DeptService.java
@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018-2020
+* Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 * 注意：
 * 本软件为www.yixiang.co开发研制，未经购买不得使用
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/DictDetailService.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/DictDetailService.java
@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018-2020
+* Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 * 注意：
 * 本软件为www.yixiang.co开发研制，未经购买不得使用
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/DictService.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/DictService.java
@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018-2020
+* Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 * 注意：
 * 本软件为www.yixiang.co开发研制，未经购买不得使用
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/JobService.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/JobService.java
@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018-2020
+* Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 * 注意：
 * 本软件为www.yixiang.co开发研制，未经购买不得使用
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/MenuService.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/MenuService.java
@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018-2020
+* Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 * 注意：
 * 本软件为www.yixiang.co开发研制，未经购买不得使用
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/RoleService.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/RoleService.java
@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018-2020
+* Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 * 注意：
 * 本软件为www.yixiang.co开发研制，未经购买不得使用
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/RolesDeptsService.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/RolesDeptsService.java
@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018-2020
+* Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 * 注意：
 * 本软件为www.yixiang.co开发研制，未经购买不得使用
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/RolesMenusService.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/RolesMenusService.java
@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018-2020
+* Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 * 注意：
 * 本软件为www.yixiang.co开发研制，未经购买不得使用
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/UserAvatarService.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/UserAvatarService.java
@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018-2020
+* Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 * 注意：
 * 本软件为www.yixiang.co开发研制，未经购买不得使用
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/UserService.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/UserService.java
@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018-2020
+* Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 * 注意：
 * 本软件为www.yixiang.co开发研制，未经购买不得使用
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/UsersRolesService.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/UsersRolesService.java
@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018-2020
+* Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 * 注意：
 * 本软件为www.yixiang.co开发研制，未经购买不得使用
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/DeptDto.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/DeptDto.java
@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018-2020
+* Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 * 注意：
 * 本软件为www.yixiang.co开发研制，未经购买不得使用
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/DeptQueryCriteria.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/DeptQueryCriteria.java
@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018-2020
+* Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 * 注意：
 * 本软件为www.yixiang.co开发研制，未经购买不得使用
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/DeptSmallDto.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/DeptSmallDto.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/DictDetailDto.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/DictDetailDto.java
@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018-2020
+* Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 * 注意：
 * 本软件为www.yixiang.co开发研制，未经购买不得使用
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/DictDetailQueryCriteria.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/DictDetailQueryCriteria.java
@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018-2020
+* Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 * 注意：
 * 本软件为www.yixiang.co开发研制，未经购买不得使用
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/DictDto.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/DictDto.java
@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018-2020
+* Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 * 注意：
 * 本软件为www.yixiang.co开发研制，未经购买不得使用
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/DictQueryCriteria.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/DictQueryCriteria.java
@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018-2020
+* Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 * 注意：
 * 本软件为www.yixiang.co开发研制，未经购买不得使用
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/DictSmallDto.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/DictSmallDto.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/JobDto.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/JobDto.java
@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018-2020
+* Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 * 注意：
 * 本软件为www.yixiang.co开发研制，未经购买不得使用
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/JobQueryCriteria.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/JobQueryCriteria.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/JobSmallDto.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/JobSmallDto.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/MenuDto.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/MenuDto.java
@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018-2020
+* Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 * 注意：
 * 本软件为www.yixiang.co开发研制，未经购买不得使用
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/MenuQueryCriteria.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/MenuQueryCriteria.java
@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018-2020
+* Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 * 注意：
 * 本软件为www.yixiang.co开发研制，未经购买不得使用
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/PermissionDto.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/PermissionDto.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/PermissionQueryCriteria.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/PermissionQueryCriteria.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/RoleDto.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/RoleDto.java
@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018-2020
+* Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 * 注意：
 * 本软件为www.yixiang.co开发研制，未经购买不得使用
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/RoleQueryCriteria.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/RoleQueryCriteria.java
@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018-2020
+* Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 * 注意：
 * 本软件为www.yixiang.co开发研制，未经购买不得使用
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/RoleSmallDto.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/RoleSmallDto.java
@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020
+ * Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 */
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/UserAvatarDto.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/UserAvatarDto.java
@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018-2020
+* Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 * 注意：
 * 本软件为www.yixiang.co开发研制，未经购买不得使用
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/UserAvatarQueryCriteria.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/UserAvatarQueryCriteria.java
@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018-2020
+* Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 * 注意：
 * 本软件为www.yixiang.co开发研制，未经购买不得使用
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/UserDto.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/UserDto.java
@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018-2020
+* Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 * 注意：
 * 本软件为www.yixiang.co开发研制，未经购买不得使用
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/UserQueryCriteria.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/dto/UserQueryCriteria.java
@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018-2020
+* Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 * 注意：
 * 本软件为www.yixiang.co开发研制，未经购买不得使用
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/DeptServiceImpl.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/DeptServiceImpl.java
@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018-2020
+* Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 * 注意：
 * 本软件为www.yixiang.co开发研制，未经购买不得使用
--- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/DictDetailServiceImpl.java
+++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/DictDetailServiceImpl.java
@ -1,5 +1,5 @@
 /**
-* Copyright (C) 2018-2020
+* Copyright (C) 2018-2021
 * All rights reserved, Designed By www.yixiang.co
 * 注意：
 * 本软件为www.yixiang.co开发研制，未经购买不得使用
--- a/Show More
+++ b/Show More