ServiceCore下Model命名空间转换

ZR.ServiceCore/Filters/ActionPermissionFilter.cs

@@ -5,6 +5,7 @@ using Microsoft.AspNetCore.Mvc.Filters;
 using ZR.Model.System;
 using ZR.Service.System;
 using ZR.Service.System.IService;
+using ZR.ServiceCore.Model;
 
 namespace ZR.ServiceCore.Middleware
 {

ZR.ServiceCore/Filters/GlobalActionMonitor.cs

@@ -9,6 +9,7 @@ using Microsoft.AspNetCore.Mvc.Filters;
 using NLog;
 using ZR.Model.System;
 using ZR.Service.System.IService;
+using ZR.ServiceCore.Model;
 
 namespace ZR.ServiceCore.Middleware
 {

ZR.ServiceCore/Middleware/GlobalExceptionMiddleware.cs

@@ -9,6 +9,7 @@ using System.Text.Encodings.Web;
 using ZR.Common;
 using ZR.Model.System;
 using ZR.Service.System.IService;
+using ZR.ServiceCore.Model;
 using textJson = System.Text.Json;
 
 namespace ZR.ServiceCore.Middleware

ZR.ServiceCore/Model/Article.cs

@@ -1,4 +1,6 @@
-namespace ZR.Model.System
+using ZR.Model.System;
+
+namespace ZR.ServiceCore.Model
 {
     /// <summary>
     /// 文章表

ZR.ServiceCore/Model/ArticleCategory.cs

@@ -1,9 +1,4 @@
-using Newtonsoft.Json;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-
-namespace ZR.Model.System
+namespace ZR.ServiceCore.Model
 {
     /// <summary>
     /// 文章目录

ZR.ServiceCore/Model/CommonLang.cs

@@ -1,9 +1,6 @@
-using Newtonsoft.Json;
-using SqlSugar;
-using System;
 using System.ComponentModel;
 
-namespace ZR.Model.Models
+namespace ZR.ServiceCore.Model
 {
     /// <summary>
     /// 多语言配置，数据实体对象

ZR.ServiceCore/Model/Dto/ArticleCategoryDto.cs

@@ -1,7 +1,7 @@
-using System;
 using System.ComponentModel.DataAnnotations;
+using ZR.Model;
 
-namespace ZR.Model.Dto
+namespace ZR.ServiceCore.Model.Dto
 {
     /// <summary>
     /// 文章目录输入对象

ZR.ServiceCore/Model/Dto/ArticleDto.cs

@@ -1,7 +1,7 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
+using ZR.Model;
 
-namespace ZR.Model.System.Dto
+namespace ZR.ServiceCore.Model.Dto
 {
     public class ArticleQueryDto : PagerInfo
     {

ZR.ServiceCore/Model/Dto/CommonLangDto.cs

@@ -1,7 +1,6 @@
-using System;
-using System.Collections.Generic;
+using ZR.Model;
 
-namespace ZR.Model.Dto
+namespace ZR.ServiceCore.Model.Dto
 {
     /// <summary>
     /// 多语言配置输入对象

ZR.ServiceCore/Model/Dto/GenTableDto.cs

@@ -1,7 +1,6 @@
-using System.Collections.Generic;
-using ZR.Model.System.Generate;
+using ZR.ServiceCore.Model.Generate;
 
-namespace ZR.Model.System.Dto
+namespace ZR.ServiceCore.Model.Dto
 {
     public class GenTableDto
     {

ZR.ServiceCore/Model/Dto/LockUserDto.cs

@@ -1,4 +1,4 @@
-namespace ZR.Model.System.Dto
+namespace ZR.ServiceCore.Model.Dto
 {
     public class LockUserDto
     {

ZR.ServiceCore/Model/Dto/LoginBodyDto.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace ZR.Model.System.Dto
+namespace ZR.ServiceCore.Model.Dto
 {
     public class LoginBodyDto
     {

ZR.ServiceCore/Model/Dto/MenuDto.cs

@@ -1,9 +1,7 @@
-using MiniExcelLibs.Attributes;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
+using MiniExcelLibs.Attributes;
 
-namespace ZR.Model.System.Dto
+namespace ZR.ServiceCore.Model.Dto
 {
     public class MenuDto
     {

ZR.ServiceCore/Model/Dto/RegisterDto.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace ZR.Model.System.Dto
+namespace ZR.ServiceCore.Model.Dto
 {
     public class RegisterDto
     {

ZR.ServiceCore/Model/Dto/RoleMenuExportDto.cs

@@ -1,8 +1,8 @@
 using MiniExcelLibs.Attributes;
-using SqlSugar.DbConvert;
 using ZR.Model.System.Enums;
+using ZR.ServiceCore.Model.Enums;
 
-namespace ZR.Model.System.Dto
+namespace ZR.ServiceCore.Model.Dto
 {
     public class RoleMenuExportDto
     {

ZR.ServiceCore/Model/Dto/RoleUserDto.cs

@@ -1,7 +1,7 @@
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
+using ZR.Model;
 
-namespace ZR.Model.System.Dto
+namespace ZR.ServiceCore.Model.Dto
 {
     public class RoleUserQueryDto : PagerInfo
     {

ZR.ServiceCore/Model/Dto/ScanDto.cs

@@ -1,4 +1,4 @@
-namespace ZR.Model.System.Dto
+namespace ZR.ServiceCore.Model.Dto
 {
     public class ScanDto
     {

ZR.ServiceCore/Model/Dto/SqlDiffLogDto.cs

@@ -1,7 +1,8 @@
 using System.ComponentModel.DataAnnotations;
 using MiniExcelLibs.Attributes;
+using ZR.Model;
 
-namespace ZR.Model.System.Dto
+namespace ZR.ServiceCore.Model.Dto
 {
     /// <summary>
     /// 数据差异日志查询对象

ZR.ServiceCore/Model/Dto/SysConfigDto.cs

@@ -1,6 +1,6 @@
-using System;
+using ZR.Model;
 
-namespace ZR.Model.System.Dto
+namespace ZR.ServiceCore.Model.Dto
 {
     /// <summary>
     /// 参数配置输入对象模型

ZR.ServiceCore/Model/Dto/SysDeptDto.cs

@@ -1,4 +1,6 @@
-namespace ZR.Model.System.Dto
+using ZR.Model;
+
+namespace ZR.ServiceCore.Model.Dto
 {
     public class SysDeptQueryDto : PagerInfo
     {

ZR.ServiceCore/Model/Dto/SysDictDataDto.cs

@@ -1,8 +1,6 @@
-using System.Collections.Generic;
-
-namespace ZR.Model.System.Dto
+namespace ZR.ServiceCore.Model.Dto
 {
-    public class SysdictDataDto
+    public class SysDictDataDto
     {
         public string DictType { get; set; }
         public string ColumnName { get; set; }

ZR.ServiceCore/Model/Dto/SysDictTypeDto.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace ZR.Model.System.Dto
+namespace ZR.ServiceCore.Model.Dto
 {
     public class SysDictTypeDto
     {

ZR.ServiceCore/Model/Dto/SysFileQueryDto.cs

@@ -1,6 +1,6 @@
-using System;
+using ZR.Model;
 
-namespace ZR.Model.System.Dto
+namespace ZR.ServiceCore.Model.Dto
 {
     /// <summary>
     /// 文件存储输入对象

ZR.ServiceCore/Model/Dto/SysLogininfoDto.cs

@@ -1,4 +1,4 @@
-namespace ZR.Model.System.Dto
+namespace ZR.ServiceCore.Model.Dto
 {
     public class SysLogininfoDto : SysBase
     {

ZR.ServiceCore/Model/Dto/SysNoticeDto.cs

@@ -1,6 +1,7 @@
 using System.ComponentModel.DataAnnotations;
+using ZR.Model;
 
-namespace ZR.Model.System.Dto
+namespace ZR.ServiceCore.Model.Dto
 {
     /// <summary>
     /// 通知公告表输入对象

ZR.ServiceCore/Model/Dto/SysOperLogDto.cs

@@ -1,6 +1,6 @@
-using System;
+using ZR.Model;
 
-namespace ZR.Model.System.Dto
+namespace ZR.ServiceCore.Model.Dto
 {
     public class SysOperLogQueryDto : PagerInfo
     {

ZR.ServiceCore/Model/Dto/SysRoleDto.cs

@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace ZR.Model.System.Dto
+namespace ZR.ServiceCore.Model.Dto
 {
     public class SysRoleDto : SysBase
     {

ZR.ServiceCore/Model/Dto/SysRoleMenuDto.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-
-namespace ZR.Model.System.Dto
+namespace ZR.ServiceCore.Model.Dto
 {
     public class SysRoleMenuDto
     {

ZR.ServiceCore/Model/Dto/SysUserDto.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace ZR.Model.System.Dto
+namespace ZR.ServiceCore.Model.Dto
 {
     public class SysUserDto
     {

ZR.ServiceCore/Model/Dto/TasksDto.cs

@@ -1,7 +1,7 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
+using ZR.Model;
 
-namespace ZR.Model.System.Dto
+namespace ZR.ServiceCore.Model.Dto
 {
     public class TasksQueryDto : PagerInfo
     {

ZR.ServiceCore/Model/Dto/TasksLogDto.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace ZR.Model.System.Dto
+namespace ZR.ServiceCore.Model.Dto
 {
     public class TasksLogQueryDto
     {

ZR.ServiceCore/Model/Enums/MenuStatus.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace ZR.Model.System.Enums
+namespace ZR.ServiceCore.Model.Enums
 {
     /// <summary>
     /// 菜单状态（0正常 1停用）

ZR.ServiceCore/Model/Generate/GenTable.cs

@@ -1,7 +1,4 @@
-using SqlSugar;
-using System.Collections.Generic;
-
-namespace ZR.Model.System.Generate
+namespace ZR.ServiceCore.Model.Generate
 {
     /// <summary>
     /// 代码生成表

ZR.ServiceCore/Model/Generate/GenTableColumn.cs

@@ -1,8 +1,4 @@
-using SqlSugar;
-using System;
-using System.Linq;
-
-namespace ZR.Model.System.Generate
+namespace ZR.ServiceCore.Model.Generate
 {
     /// <summary>
     /// 代码生成表字段

ZR.ServiceCore/Model/SqlDiffLog.cs

@@ -1,4 +1,4 @@
-namespace ZR.Model.System
+namespace ZR.ServiceCore.Model
 {
     [SugarTable("SqlDiffLog", "数据差异日志")]
     [Tenant("0")]

ZR.ServiceCore/Model/SysBase.cs

@@ -1,9 +1,6 @@
 using MiniExcelLibs.Attributes;
-using Newtonsoft.Json;
-using SqlSugar;
-using System;
 
-namespace ZR.Model.System
+namespace ZR.ServiceCore.Model
 {
     //[EpplusTable(PrintHeaders = true, AutofitColumns = true, AutoCalculate = true, ShowTotal = true)]
     public class SysBase

ZR.ServiceCore/Model/SysConfig.cs

@@ -1,6 +1,6 @@
-using SqlSugar;
+using ZR.Model.System;
 
-namespace ZR.Model.System
+namespace ZR.ServiceCore.Model
 {
     /// <summary>
     /// 参数配置，数据实体对象

ZR.ServiceCore/Model/SysDept.cs

@@ -1,4 +1,6 @@
-namespace ZR.Model.System
+using ZR.Model.System;
+
+namespace ZR.ServiceCore.Model
 {
     /// <summary>
     /// 部门表

ZR.ServiceCore/Model/SysDictData.cs

@@ -1,6 +1,6 @@
-using SqlSugar;
+using ZR.Model.System;
 
-namespace ZR.Model.System
+namespace ZR.ServiceCore.Model
 {
     /// <summary>
     /// 字典数据表

ZR.ServiceCore/Model/SysDictType.cs

@@ -1,6 +1,6 @@
-using SqlSugar;
+using ZR.Model.System;
 
-namespace ZR.Model.System
+namespace ZR.ServiceCore.Model
 {
     /// <summary>
     /// 字典类型表

ZR.ServiceCore/Model/SysField.cs

@@ -0,0 +1,14 @@
+namespace ZR.ServiceCore.Model;
+
+[SugarTable("sys_field")]
+[Tenant("0")]
+public class SysField
+{
+    [JsonConverter(typeof(ValueToStringConverter))]
+    [SugarColumn(IsPrimaryKey = true)]
+    public long Id { get; set; }
+    
+    public string FieldName { get; set; }
+    
+    public string FullName { get; set; }
+}

ZR.ServiceCore/Model/SysFile.cs

@@ -1,8 +1,4 @@
-using Newtonsoft.Json;
-using SqlSugar;
-using System;
-
-namespace ZR.Model.System
+namespace ZR.ServiceCore.Model
 {
     [Tenant("0")]
     [SugarTable("sys_file", "文件存储表")]

ZR.ServiceCore/Model/SysLogininfor.cs

@@ -1,7 +1,4 @@
-using SqlSugar;
-using System;
-
-namespace ZR.Model.System
+namespace ZR.ServiceCore.Model
 {
     /// <summary>
     /// sys_logininfor 表

ZR.ServiceCore/Model/SysMenu.cs

@@ -1,7 +1,6 @@
-using SqlSugar;
-using System.Collections.Generic;
+using ZR.Model.System;
 
-namespace ZR.Model.System
+namespace ZR.ServiceCore.Model
 {
     /// <summary>
     /// Sys_menu表

ZR.ServiceCore/Model/SysNotice.cs

@@ -1,6 +1,6 @@
-using SqlSugar;
+using ZR.Model.System;
 
-namespace ZR.Model.System
+namespace ZR.ServiceCore.Model
 {
     /// <summary>
     /// 通知公告表

ZR.ServiceCore/Model/SysOperLog.cs

@@ -1,9 +1,6 @@
 using MiniExcelLibs.Attributes;
-using SqlSugar;
-using System;
-using System.ComponentModel;
 
-namespace ZR.Model.System
+namespace ZR.ServiceCore.Model
 {
     [SugarTable("sys_oper_log", "操作日志表")]
     [Tenant("0")]

ZR.ServiceCore/Model/SysPost.cs

@@ -1,6 +1,6 @@
-using SqlSugar;
+using ZR.Model.System;
 
-namespace ZR.Model.System
+namespace ZR.ServiceCore.Model
 {
     [SugarTable("sys_post", "岗位表")]
     [Tenant("0")]

ZR.ServiceCore/Model/SysRole.cs

@@ -1,6 +1,6 @@
-using SqlSugar;
+using ZR.Model.System;
 
-namespace ZR.Model.System
+namespace ZR.ServiceCore.Model
 {
     /// <summary>
     /// 角色表 sys_role

ZR.ServiceCore/Model/SysRoleDept.cs

@@ -1,6 +1,4 @@
-using SqlSugar;
-
-namespace ZR.Model.System
+namespace ZR.ServiceCore.Model
 {
     [SugarTable("sys_role_dept", "角色部门")]
     [Tenant(0)]

ZR.ServiceCore/Model/SysRoleField.cs

@@ -0,0 +1,10 @@
+namespace ZR.ServiceCore.Model;
+
+[SugarTable("sys_role_field")]
+[Tenant("0")]
+public class SysRoleField
+{
+    public long FieldId { get; set; }
+    
+    public long RoleId { get; set; }
+}

ZR.ServiceCore/Model/SysRoleMenu.cs

@@ -1,7 +1,4 @@
-using Newtonsoft.Json;
-using SqlSugar;
-
-namespace ZR.Model.System
+namespace ZR.ServiceCore.Model
 {
     /// <summary>
     /// 角色菜单

ZR.ServiceCore/Model/SysTasks.cs

@@ -1,8 +1,7 @@
-using SqlSugar;
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
+using ZR.Model.System;
 
-namespace ZR.Model.System
+namespace ZR.ServiceCore.Model
 {
     ///<summary>
     ///计划任务

ZR.ServiceCore/Model/SysTasksLog.cs

@@ -1,7 +1,4 @@
-using SqlSugar;
-using System;
-
-namespace ZR.Model.System
+namespace ZR.ServiceCore.Model
 {
     /// <summary>
     /// 任务日志

ZR.ServiceCore/Model/SysUser.cs

@@ -1,10 +1,7 @@
 using MiniExcelLibs.Attributes;
-using Newtonsoft.Json;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
+using ZR.Model.System;
 
-namespace ZR.Model.System
+namespace ZR.ServiceCore.Model
 {
     /// <summary>
     /// 用户表

ZR.ServiceCore/Model/SysUserPost.cs

@@ -1,6 +1,4 @@
-using SqlSugar;
-
-namespace ZR.Model.System
+namespace ZR.ServiceCore.Model
 {
     /// <summary>
     /// 用户岗位

ZR.ServiceCore/Model/SysUserRole.cs

@@ -1,6 +1,4 @@
-using SqlSugar;
-
-namespace ZR.Model.System
+namespace ZR.ServiceCore.Model
 {
     /// <summary>
     /// 用户角色关联表 用户N-1 角色

ZR.ServiceCore/Model/UserConstants.cs

@@ -1,4 +1,4 @@
-namespace ZR.Model.System
+namespace ZR.ServiceCore.Model
 {
     public class UserConstants
     {

ZR.ServiceCore/Model/Vo/RouterVo.cs

@@ -1,7 +1,4 @@
-using Newtonsoft.Json;
-using System.Collections.Generic;
-
-namespace ZR.Model.System.Vo
+namespace ZR.ServiceCore.Model.Vo
 {
     /// <summary>
     /// 路由展示

ZR.ServiceCore/Model/Vo/TreeSelectVo.cs

@@ -1,4 +1,4 @@
-namespace ZR.Model.System.Vo
+namespace ZR.ServiceCore.Model.Vo
 {
     /// <summary>
     /// Treeselect树结构实体类

ZR.ServiceCore/Services/ArticleCategoryService.cs

@@ -2,10 +2,11 @@
 using SqlSugar;
 using System.Collections.Generic;
 using ZR.Model;
-using ZR.Model.Dto;
 using ZR.Model.System;
 using ZR.Repository;
 using ZR.Service.System.IService;
+using ZR.ServiceCore.Model;
+using ZR.ServiceCore.Model.Dto;
 
 namespace ZR.Service.System
 {

ZR.ServiceCore/Services/ArticleService.cs

@@ -3,9 +3,10 @@ using SqlSugar;
 using System;
 using ZR.Model;
 using ZR.Model.System;
-using ZR.Model.System.Dto;
 using ZR.Repository;
 using ZR.Service.System.IService;
+using ZR.ServiceCore.Model;
+using ZR.ServiceCore.Model.Dto;
 
 namespace ZR.Service.System
 {

ZR.ServiceCore/Services/CommonLangService.cs

@@ -3,10 +3,10 @@ using SqlSugar;
 using System;
 using System.Linq;
 using ZR.Model;
-using ZR.Model.Dto;
-using ZR.Model.Models;
 using ZR.Repository;
 using ZR.Service.System.IService;
+using ZR.ServiceCore.Model;
+using ZR.ServiceCore.Model.Dto;
 
 namespace ZR.Service.System
 {

ZR.ServiceCore/Services/GenTableService.cs

@@ -5,8 +5,8 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using ZR.Model;
-using ZR.Model.System.Generate;
 using ZR.Service.System.IService;
+using ZR.ServiceCore.Model.Generate;
 
 namespace ZR.Service.System
 {

ZR.ServiceCore/Services/IService/IArticleCategoryService.cs

@@ -1,7 +1,8 @@
 using System.Collections.Generic;
 using ZR.Model;
-using ZR.Model.Dto;
 using ZR.Model.System;
+using ZR.ServiceCore.Model;
+using ZR.ServiceCore.Model.Dto;
 
 namespace ZR.Service.System.IService
 {

ZR.ServiceCore/Services/IService/IArticleService.cs

@@ -1,6 +1,7 @@
 using ZR.Model;
 using ZR.Model.System;
-using ZR.Model.System.Dto;
+using ZR.ServiceCore.Model;
+using ZR.ServiceCore.Model.Dto;
 
 namespace ZR.Service.System.IService
 {

ZR.ServiceCore/Services/IService/ICommonLangService.cs

@@ -1,6 +1,6 @@
 using ZR.Model;
-using ZR.Model.Dto;
-using ZR.Model.Models;
+using ZR.ServiceCore.Model;
+using ZR.ServiceCore.Model.Dto;
 
 namespace ZR.Service.System.IService
 {

ZR.ServiceCore/Services/IService/IGenTableService.cs

@@ -1,7 +1,7 @@
 using SqlSugar;
 using System.Collections.Generic;
 using ZR.Model;
-using ZR.Model.System.Generate;
+using ZR.ServiceCore.Model.Generate;
 
 namespace ZR.Service.System.IService
 {

ZR.ServiceCore/Services/IService/ISqlDiffLogService.cs

@@ -1,6 +1,7 @@
 using ZR.Model;
 using ZR.Model.System;
-using ZR.Model.System.Dto;
+using ZR.ServiceCore.Model;
+using ZR.ServiceCore.Model.Dto;
 
 namespace ZR.Service.System.IService
 {

ZR.ServiceCore/Services/IService/ISysConfigService.cs

@@ -1,5 +1,6 @@
 using System;
 using ZR.Model.System;
+using ZR.ServiceCore.Model;
 
 namespace ZR.Service.System.IService
 {

ZR.ServiceCore/Services/IService/ISysDeptService.cs

@@ -1,7 +1,8 @@
 using System.Collections.Generic;
 using ZR.Model.System;
-using ZR.Model.System.Dto;
-using ZR.Model.System.Vo;
+using ZR.ServiceCore.Model;
+using ZR.ServiceCore.Model.Dto;
+using ZR.ServiceCore.Model.Vo;
 
 namespace ZR.Service.System.IService
 {

ZR.ServiceCore/Services/IService/ISysDictDataService.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using ZR.Model;
 using ZR.Model.System;
+using ZR.ServiceCore.Model;
 
 namespace ZR.Service.System.IService
 {

ZR.ServiceCore/Services/IService/ISysDictService.cs

@@ -2,6 +2,7 @@
 using System.Text;
 using ZR.Model;
 using ZR.Model.System;
+using ZR.ServiceCore.Model;
 
 namespace ZR.Service.System.IService
 {

ZR.ServiceCore/Services/IService/ISysFileService.cs

@@ -1,8 +1,8 @@
 using Infrastructure.Attribute;
 using Microsoft.AspNetCore.Http;
 using System.Threading.Tasks;
-using ZR.Model.Models;
 using ZR.Model.System;
+using ZR.ServiceCore.Model;
 
 namespace ZR.Service.System.IService
 {

ZR.ServiceCore/Services/IService/ISysLoginService.cs

@@ -2,7 +2,8 @@
 using System;
 using ZR.Model;
 using ZR.Model.System;
-using ZR.Model.System.Dto;
+using ZR.ServiceCore.Model;
+using ZR.ServiceCore.Model.Dto;
 
 namespace ZR.Service.System.IService
 {

ZR.ServiceCore/Services/IService/ISysMenuService.cs

@@ -1,8 +1,9 @@
 using System.Collections.Generic;
-using ZR.Model.System.Dto;
 using ZR.Model.System;
-using ZR.Model.System.Vo;
-using ZR.Model.System.Generate;
+using ZR.ServiceCore.Model;
+using ZR.ServiceCore.Model.Dto;
+using ZR.ServiceCore.Model.Generate;
+using ZR.ServiceCore.Model.Vo;
 
 namespace ZR.Service.System.IService
 {

ZR.ServiceCore/Services/IService/ISysNoticeService.cs

@@ -1,7 +1,8 @@
 using System.Collections.Generic;
 using ZR.Model;
 using ZR.Model.System;
-using ZR.Model.System.Dto;
+using ZR.ServiceCore.Model;
+using ZR.ServiceCore.Model.Dto;
 
 namespace ZR.Service.System.IService
 {

ZR.ServiceCore/Services/IService/ISysOperLogService.cs

@@ -1,6 +1,7 @@
 using ZR.Model;
 using ZR.Model.System;
-using ZR.Model.System.Dto;
+using ZR.ServiceCore.Model;
+using ZR.ServiceCore.Model.Dto;
 
 namespace ZR.Service.System.IService
 {

ZR.ServiceCore/Services/IService/ISysPermissionService.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using ZR.Model.System;
+using ZR.ServiceCore.Model;
 
 namespace ZR.Service.System.IService
 {

ZR.ServiceCore/Services/IService/ISysPostService.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using ZR.Model.System;
 using ZR.Repository;
+using ZR.ServiceCore.Model;
 
 namespace ZR.Service.System.IService
 {

ZR.ServiceCore/Services/IService/ISysRoleService.cs

@@ -1,7 +1,8 @@
 using System.Collections.Generic;
 using ZR.Model;
 using ZR.Model.System;
-using ZR.Model.System.Dto;
+using ZR.ServiceCore.Model;
+using ZR.ServiceCore.Model.Dto;
 
 namespace ZR.Service.System.IService
 {

ZR.ServiceCore/Services/IService/ISysTasksLogService.cs

@@ -1,6 +1,7 @@
 using System.Threading.Tasks;
 using ZR.Model.System;
 using ZR.Repository;
+using ZR.ServiceCore.Model;
 
 namespace ZR.Service.System.IService
 {

ZR.ServiceCore/Services/IService/ISysTasksQzService.cs

@@ -1,6 +1,7 @@
 using ZR.Model;
 using ZR.Model.System;
-using ZR.Model.System.Dto;
+using ZR.ServiceCore.Model;
+using ZR.ServiceCore.Model.Dto;
 
 namespace ZR.Service.System.IService
 {

ZR.ServiceCore/Services/IService/ISysUserPostService.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using ZR.Model.System;
+using ZR.ServiceCore.Model;
 
 namespace ZR.Service.System.IService
 {

ZR.ServiceCore/Services/IService/ISysUserRoleService.cs

@@ -1,7 +1,8 @@
 using System.Collections.Generic;
 using ZR.Model;
 using ZR.Model.System;
-using ZR.Model.System.Dto;
+using ZR.ServiceCore.Model;
+using ZR.ServiceCore.Model.Dto;
 
 namespace ZR.Service.System.IService
 {

ZR.ServiceCore/Services/IService/ISysUserService.cs

@@ -1,7 +1,8 @@
 using System.Collections.Generic;
 using ZR.Model;
 using ZR.Model.System;
-using ZR.Model.System.Dto;
+using ZR.ServiceCore.Model;
+using ZR.ServiceCore.Model.Dto;
 
 namespace ZR.Service.System.IService
 {

ZR.ServiceCore/Services/SeedDataService.cs

@@ -2,6 +2,7 @@
 using SqlSugar.IOC;
 using ZR.Common;
 using ZR.Model.System;
+using ZR.ServiceCore.Model;
 
 namespace ZR.Service.System
 {

ZR.ServiceCore/Services/SqlDiffLogService.cs

@@ -4,9 +4,10 @@ using SqlSugar;
 using System;
 using ZR.Model;
 using ZR.Model.System;
-using ZR.Model.System.Dto;
 using ZR.Repository;
 using ZR.Service.System.IService;
+using ZR.ServiceCore.Model;
+using ZR.ServiceCore.Model.Dto;
 
 namespace ZR.Service.System
 {

ZR.ServiceCore/Services/SysConfigService.cs

@@ -1,6 +1,7 @@
 using Infrastructure.Attribute;
 using ZR.Model.System;
 using ZR.Service.System.IService;
+using ZR.ServiceCore.Model;
 
 namespace ZR.Service.System
 {

ZR.ServiceCore/Services/SysDeptService.cs

@@ -7,9 +7,10 @@ using System.Collections.Generic;
 using System.Linq;
 using ZR.Common;
 using ZR.Model.System;
-using ZR.Model.System.Dto;
-using ZR.Model.System.Vo;
 using ZR.Service.System.IService;
+using ZR.ServiceCore.Model;
+using ZR.ServiceCore.Model.Dto;
+using ZR.ServiceCore.Model.Vo;
 
 namespace ZR.Service.System
 {

ZR.ServiceCore/Services/SysDictDataService.cs

@@ -7,6 +7,7 @@ using ZR.Common;
 using ZR.Model;
 using ZR.Model.System;
 using ZR.Service.System.IService;
+using ZR.ServiceCore.Model;
 
 namespace ZR.Service.System
 {

ZR.ServiceCore/Services/SysDictService.cs

@@ -7,6 +7,7 @@ using System.Linq;
 using ZR.Model;
 using ZR.Model.System;
 using ZR.Service.System.IService;
+using ZR.ServiceCore.Model;
 
 namespace ZR.Service.System
 {

ZR.ServiceCore/Services/SysFileService.cs

@@ -10,6 +10,7 @@ using System.Text;
 using ZR.Common;
 using ZR.Model.System;
 using ZR.Service.System.IService;
+using ZR.ServiceCore.Model;
 
 namespace ZR.Service.System
 {

ZR.ServiceCore/Services/SysLoginService.cs

@@ -5,9 +5,10 @@ using Microsoft.AspNetCore.Http;
 using UAParser;
 using ZR.Model;
 using ZR.Model.System;
-using ZR.Model.System.Dto;
 using ZR.Repository;
 using ZR.Service.System.IService;
+using ZR.ServiceCore.Model;
+using ZR.ServiceCore.Model.Dto;
 
 namespace ZR.Service.System
 {

ZR.ServiceCore/Services/SysMenuService.cs

@@ -6,11 +6,13 @@ using System.Collections.Generic;
 using System.Linq;
 using ZR.Common;
 using ZR.Model.System;
-using ZR.Model.System.Dto;
 using ZR.Model.System.Enums;
-using ZR.Model.System.Generate;
-using ZR.Model.System.Vo;
 using ZR.Service.System.IService;
+using ZR.ServiceCore.Model;
+using ZR.ServiceCore.Model.Dto;
+using ZR.ServiceCore.Model.Enums;
+using ZR.ServiceCore.Model.Generate;
+using ZR.ServiceCore.Model.Vo;
 
 namespace ZR.Service
 {

ZR.ServiceCore/Services/SysNoticeService.cs

@@ -3,8 +3,9 @@ using SqlSugar;
 using System.Collections.Generic;
 using ZR.Model;
 using ZR.Model.System;
-using ZR.Model.System.Dto;
 using ZR.Service.System.IService;
+using ZR.ServiceCore.Model;
+using ZR.ServiceCore.Model.Dto;
 
 namespace ZR.Service.System
 {

ZR.ServiceCore/Services/SysOperLogService.cs

@@ -4,9 +4,10 @@ using Infrastructure.Extensions;
 using SqlSugar;
 using ZR.Model;
 using ZR.Model.System;
-using ZR.Model.System.Dto;
 using ZR.Repository;
 using ZR.Service.System.IService;
+using ZR.ServiceCore.Model;
+using ZR.ServiceCore.Model.Dto;
 
 namespace ZR.Service.System
 {

ZR.ServiceCore/Services/SysPermissionService.cs

@@ -3,6 +3,7 @@ using Infrastructure.Attribute;
 using System.Collections.Generic;
 using ZR.Model.System;
 using ZR.Service.System.IService;
+using ZR.ServiceCore.Model;
 
 namespace ZR.Service.System
 {

ZR.ServiceCore/Services/SysPostService.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using ZR.Model.System;
 using ZR.Service.System.IService;
+using ZR.ServiceCore.Model;
 
 namespace ZR.Service.System
 {

ZR.ServiceCore/Services/SysRoleMenuService.cs

@@ -1,6 +1,7 @@
 using Infrastructure.Attribute;
 using ZR.Model.System;
 using ZR.Service.System.IService;
+using ZR.ServiceCore.Model;
 
 namespace ZR.Service.System
 {

ZR.ServiceCore/Services/SysRoleService.cs

@@ -7,9 +7,10 @@ using System.Collections.Generic;
 using System.Linq;
 using ZR.Model;
 using ZR.Model.System;
-using ZR.Model.System.Dto;
 using ZR.Repository;
 using ZR.Service.System.IService;
+using ZR.ServiceCore.Model;
+using ZR.ServiceCore.Model.Dto;
 
 namespace ZR.Service
 {