mirror of
https://github.com/continew-org/continew-admin.git
synced 2025-09-10 08:57:14 +08:00
Merge branch 'dev' into 2.0.x
# Conflicts: # continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/query/SortQuery.java # continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/LoginLogQuery.java # continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/OperationLogQuery.java # continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/SystemLogQuery.java # continew-admin-system/src/main/java/top/charles7c/cnadmin/auth/model/query/OnlineUserQuery.java # continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/DeptQuery.java # continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/MenuQuery.java # continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/RoleQuery.java # continew-admin-system/src/main/java/top/charles7c/cnadmin/system/model/query/UserQuery.java
This commit is contained in:
@@ -25,7 +25,6 @@ import lombok.Data;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import org.springdoc.core.annotations.ParameterObject;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import top.charles7c.cnadmin.common.constant.StringConsts;
|
||||
@@ -37,7 +36,6 @@ import top.charles7c.cnadmin.common.constant.StringConsts;
|
||||
* @since 2023/1/20 23:07
|
||||
*/
|
||||
@Data
|
||||
@ParameterObject
|
||||
@Schema(description = "在线用户查询条件")
|
||||
public class OnlineUserQuery implements Serializable {
|
||||
|
||||
|
||||
@@ -53,7 +53,7 @@ import top.charles7c.cnadmin.system.service.RoleService;
|
||||
import top.charles7c.cnadmin.system.service.UserService;
|
||||
|
||||
/**
|
||||
* 登录业务实现类
|
||||
* 登录业务实现
|
||||
*
|
||||
* @author Charles7c
|
||||
* @since 2022/12/21 21:49
|
||||
|
||||
@@ -41,7 +41,7 @@ import top.charles7c.cnadmin.common.model.vo.PageDataVO;
|
||||
import top.charles7c.cnadmin.common.util.helper.LoginHelper;
|
||||
|
||||
/**
|
||||
* 在线用户业务实现类
|
||||
* 在线用户业务实现
|
||||
*
|
||||
* @author Charles7c
|
||||
* @author Lion Li（RuoYi-Vue-Plus）
|
||||
|
||||
@@ -30,7 +30,7 @@ import top.charles7c.cnadmin.system.service.MenuService;
|
||||
import top.charles7c.cnadmin.system.service.RoleService;
|
||||
|
||||
/**
|
||||
* 权限业务实现类
|
||||
* 权限业务实现
|
||||
*
|
||||
* @author Charles7c
|
||||
* @since 2023/3/2 20:40
|
||||
|
||||
@@ -23,8 +23,6 @@ import lombok.Data;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import org.springdoc.core.annotations.ParameterObject;
|
||||
|
||||
import top.charles7c.cnadmin.common.annotation.Query;
|
||||
|
||||
/**
|
||||
@@ -34,7 +32,6 @@ import top.charles7c.cnadmin.common.annotation.Query;
|
||||
* @since 2023/1/22 17:52
|
||||
*/
|
||||
@Data
|
||||
@ParameterObject
|
||||
@Schema(description = "部门查询条件")
|
||||
public class DeptQuery implements Serializable {
|
||||
|
||||
|
||||
@@ -23,8 +23,6 @@ import lombok.Data;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import org.springdoc.core.annotations.ParameterObject;
|
||||
|
||||
import top.charles7c.cnadmin.common.annotation.Query;
|
||||
|
||||
/**
|
||||
@@ -34,7 +32,6 @@ import top.charles7c.cnadmin.common.annotation.Query;
|
||||
* @since 2023/2/15 20:21
|
||||
*/
|
||||
@Data
|
||||
@ParameterObject
|
||||
@Schema(description = "菜单查询条件")
|
||||
public class MenuQuery implements Serializable {
|
||||
|
||||
|
||||
@@ -23,8 +23,6 @@ import lombok.Data;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import org.springdoc.core.annotations.ParameterObject;
|
||||
|
||||
import top.charles7c.cnadmin.common.annotation.Query;
|
||||
|
||||
/**
|
||||
@@ -34,7 +32,6 @@ import top.charles7c.cnadmin.common.annotation.Query;
|
||||
* @since 2023/2/8 23:04
|
||||
*/
|
||||
@Data
|
||||
@ParameterObject
|
||||
@Schema(description = "角色查询条件")
|
||||
public class RoleQuery implements Serializable {
|
||||
|
||||
|
||||
@@ -25,7 +25,6 @@ import lombok.Data;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import org.springdoc.core.annotations.ParameterObject;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import top.charles7c.cnadmin.common.annotation.Query;
|
||||
@@ -38,7 +37,6 @@ import top.charles7c.cnadmin.common.constant.StringConsts;
|
||||
* @since 2023/2/20 21:01
|
||||
*/
|
||||
@Data
|
||||
@ParameterObject
|
||||
@Schema(description = "用户查询条件")
|
||||
public class UserQuery implements Serializable {
|
||||
|
||||
|
||||
@@ -48,7 +48,7 @@ import top.charles7c.cnadmin.system.service.RoleDeptService;
|
||||
import top.charles7c.cnadmin.system.service.UserService;
|
||||
|
||||
/**
|
||||
* 部门业务实现类
|
||||
* 部门业务实现
|
||||
*
|
||||
* @author Charles7c
|
||||
* @since 2023/1/22 17:55
|
||||
|
||||
@@ -36,7 +36,7 @@ import top.charles7c.cnadmin.system.model.vo.MenuVO;
|
||||
import top.charles7c.cnadmin.system.service.MenuService;
|
||||
|
||||
/**
|
||||
* 菜单业务实现类
|
||||
* 菜单业务实现
|
||||
*
|
||||
* @author Charles7c
|
||||
* @since 2023/2/15 20:30
|
||||
|
||||
@@ -31,7 +31,7 @@ import top.charles7c.cnadmin.system.model.entity.RoleDeptDO;
|
||||
import top.charles7c.cnadmin.system.service.RoleDeptService;
|
||||
|
||||
/**
|
||||
* 角色和部门业务实现类
|
||||
* 角色和部门业务实现
|
||||
*
|
||||
* @author Charles7c
|
||||
* @since 2023/2/19 10:47
|
||||
|
||||
@@ -32,7 +32,7 @@ import top.charles7c.cnadmin.system.model.entity.RoleMenuDO;
|
||||
import top.charles7c.cnadmin.system.service.RoleMenuService;
|
||||
|
||||
/**
|
||||
* 角色和菜单业务实现类
|
||||
* 角色和菜单业务实现
|
||||
*
|
||||
* @author Charles7c
|
||||
* @since 2023/2/19 10:43
|
||||
|
||||
@@ -47,7 +47,7 @@ import top.charles7c.cnadmin.system.model.vo.RoleVO;
|
||||
import top.charles7c.cnadmin.system.service.*;
|
||||
|
||||
/**
|
||||
* 角色业务实现类
|
||||
* 角色业务实现
|
||||
*
|
||||
* @author Charles7c
|
||||
* @since 2023/2/8 23:17
|
||||
|
||||
@@ -31,7 +31,7 @@ import top.charles7c.cnadmin.system.model.entity.UserRoleDO;
|
||||
import top.charles7c.cnadmin.system.service.UserRoleService;
|
||||
|
||||
/**
|
||||
* 用户和角色业务实现类
|
||||
* 用户和角色业务实现
|
||||
*
|
||||
* @author Charles7c
|
||||
* @since 2023/2/20 21:30
|
||||
|
||||
@@ -63,7 +63,7 @@ import top.charles7c.cnadmin.system.service.UserRoleService;
|
||||
import top.charles7c.cnadmin.system.service.UserService;
|
||||
|
||||
/**
|
||||
* 用户业务实现类
|
||||
* 用户业务实现
|
||||
*
|
||||
* @author Charles7c
|
||||
* @since 2022/12/21 21:49
|
||||
|
||||
Reference in New Issue
Block a user