diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/admin/TArchivesController.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/admin/TArchivesController.java
index a7f45a28..aae90faa 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/admin/TArchivesController.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/admin/TArchivesController.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.knowledge.controller;
+package cn.iocoder.yudao.module.knowledge.controller.admin;
 
 
 import cn.iocoder.yudao.module.knowledge.constants.Result;
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/admin/TLawsController.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/admin/TLawsController.java
index 864efee7..b4f2b733 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/admin/TLawsController.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/admin/TLawsController.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.knowledge.controller;
+package cn.iocoder.yudao.module.knowledge.controller.admin;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/admin/TRegulatoryFrameworkController.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/admin/TRegulatoryFrameworkController.java
index 215deac5..43e3b33d 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/admin/TRegulatoryFrameworkController.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/admin/TRegulatoryFrameworkController.java
@@ -1,13 +1,10 @@
-package cn.iocoder.yudao.module.knowledge.controller;
+package cn.iocoder.yudao.module.knowledge.controller.admin;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import cn.iocoder.yudao.module.knowledge.service.TRegulatoryFrameworkService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import cn.iocoder.yudao.module.knowledge.controller.requestdto.TRegulatoryFrameworkRequest;
 import cn.iocoder.yudao.module.knowledge.entity.TRegulatoryFramework;
-import cn.iocoder.yudao.module.knowledge.service.TRegulatoryFrameworkService;
 import cn.iocoder.yudao.module.knowledge.utils.ExcelUtils;
 import cn.iocoder.yudao.module.knowledge.constants.Result;
 import org.slf4j.Logger;
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/admin/TViolationController.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/admin/TViolationController.java
index b9a2343d..5bf2579f 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/admin/TViolationController.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/admin/TViolationController.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.knowledge.controller;
+package cn.iocoder.yudao.module.knowledge.controller.admin;
 
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
@@ -157,16 +157,6 @@ public class TViolationController  {
     public Result deleteForApp(@RequestParam("ids") List<Long> ids) {
         return Result.success(violationService.deleteForApp(ids));
     }
-    /**
-     * 推送
-     * @param id
-     * @return
-     */
-    @PostMapping(value = "/push",produces = "application/json;charset=UTF-8")
-    public Result pushMsg(@RequestParam(value = "id") Long id,@RequestParam(value = "deptId") String deptId) {
-        violationService.pushMsg(id,deptId);
-        return Result.success();
-    }
     /**
      * 推送
      * @param id
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/KnowledgeStatisticsRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/KnowledgeStatisticsRequest.java
index 5724e8c6..d5bbc24b 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/KnowledgeStatisticsRequest.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/KnowledgeStatisticsRequest.java
@@ -29,7 +29,7 @@ public class KnowledgeStatisticsRequest extends PageParam {
     //是否归档
     private Integer isFiling;
     //是否删除
-    private Integer deleted;
+    
     //预留字段
     private String lawsA;
     //预留字段
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/RRfeuTaskFileRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/RRfeuTaskFileRequest.java
index e5d360d8..4fc4cdec 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/RRfeuTaskFileRequest.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/RRfeuTaskFileRequest.java
@@ -2,14 +2,12 @@ package cn.iocoder.yudao.module.knowledge.controller.requestdto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import jakarta.validation.constraints.NotNull;
-import cn.iocoder.yudao.module.knowledge.validated.EditGroup;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import org.springframework.format.annotation.DateTimeFormat;
-import jakarta.validation.constraints.NotBlank;
 
 import java.util.Date;
 
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TArchivesRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TArchivesRequest.java
index b0316fe8..ae458f32 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TArchivesRequest.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TArchivesRequest.java
@@ -36,7 +36,7 @@ public class TArchivesRequest extends PageParam {
     //是否是文件夹 0：文件夹 1:文件
     private Integer isDir;
     //是否删除 0：已删除，1：未删除
-    private Integer deleted;
+    
     //是否移到回收站 0：是 1：否
     private Integer isRecycled;
     //ids
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TCourseDirectoryRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TCourseDirectoryRequest.java
index fbc0d04e..613e6b9e 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TCourseDirectoryRequest.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TCourseDirectoryRequest.java
@@ -3,8 +3,9 @@ package cn.iocoder.yudao.module.knowledge.controller.requestdto;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.module.knowledge.validated.EditGroup;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TCoursePushRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TCoursePushRequest.java
index e1d93576..fd630557 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TCoursePushRequest.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TCoursePushRequest.java
@@ -4,8 +4,8 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.module.knowledge.validated.EditGroup;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springframework.format.annotation.DateTimeFormat;
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TCourseRecordsRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TCourseRecordsRequest.java
index b173cc12..6d77bd8b 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TCourseRecordsRequest.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TCourseRecordsRequest.java
@@ -1,14 +1,14 @@
 package cn.iocoder.yudao.module.knowledge.controller.requestdto;
 
 import com.baomidou.mybatisplus.annotation.TableId;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import cn.iocoder.yudao.module.knowledge.validated.EditGroup;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import org.springframework.format.annotation.DateTimeFormat;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
 
 import java.util.Date;
 
@@ -66,7 +66,7 @@ public class TCourseRecordsRequest extends PageParam {
     /**
      * 是否删除 1：已删除，0：未删除
      */
-    private Integer deleted;
+    
 
     /**
      * 租户id
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TCourseRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TCourseRequest.java
index 97146059..00c26a23 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TCourseRequest.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TCourseRequest.java
@@ -4,8 +4,8 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.module.knowledge.validated.EditGroup;
 import io.swagger.v3.oas.annotations.media.Schema;
 import javax.validation.Valid;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TExpertMaintenanceRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TExpertMaintenanceRequest.java
index 023367f4..b07ed2e1 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TExpertMaintenanceRequest.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TExpertMaintenanceRequest.java
@@ -3,14 +3,14 @@ package cn.iocoder.yudao.module.knowledge.controller.requestdto;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import cn.iocoder.yudao.module.knowledge.validated.EditGroup;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import org.springframework.format.annotation.DateTimeFormat;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
 
 import java.util.Date;
 
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TExpertRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TExpertRequest.java
index 2c7c5195..16f91649 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TExpertRequest.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TExpertRequest.java
@@ -1,14 +1,14 @@
 package cn.iocoder.yudao.module.knowledge.controller.requestdto;
 
 import com.baomidou.mybatisplus.annotation.TableId;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import cn.iocoder.yudao.module.knowledge.validated.EditGroup;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import org.springframework.format.annotation.DateTimeFormat;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
 
 import java.util.Date;
 
@@ -85,5 +85,5 @@ public class TExpertRequest extends PageParam {
     /**
      * 是否删除 1：已删除，0：未删除
      */
-    private Integer deleted;
+    
 }
\ No newline at end of file
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TExpertZoneCollectionRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TExpertZoneCollectionRequest.java
index f1e33b4b..69f82a00 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TExpertZoneCollectionRequest.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TExpertZoneCollectionRequest.java
@@ -1,13 +1,13 @@
 package cn.iocoder.yudao.module.knowledge.controller.requestdto;
 
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import cn.iocoder.yudao.module.knowledge.validated.EditGroup;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import org.springframework.format.annotation.DateTimeFormat;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
 
 /**
  * 专家专区收藏信息表查询
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TExpertZoneCommentRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TExpertZoneCommentRequest.java
index 1581ec44..27b7075f 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TExpertZoneCommentRequest.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TExpertZoneCommentRequest.java
@@ -1,13 +1,13 @@
 package cn.iocoder.yudao.module.knowledge.controller.requestdto;
 
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import cn.iocoder.yudao.module.knowledge.validated.EditGroup;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import org.springframework.format.annotation.DateTimeFormat;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
 
 import java.util.Date;
 
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TExpertZoneRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TExpertZoneRequest.java
index 3a8f9f1c..3a75b881 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TExpertZoneRequest.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TExpertZoneRequest.java
@@ -1,13 +1,13 @@
 package cn.iocoder.yudao.module.knowledge.controller.requestdto;
 
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import cn.iocoder.yudao.module.knowledge.validated.EditGroup;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import org.springframework.format.annotation.DateTimeFormat;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
 
 import java.util.Date;
 
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TLawsRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TLawsRequest.java
index 582f1b88..3f0b458e 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TLawsRequest.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TLawsRequest.java
@@ -29,7 +29,7 @@ public class TLawsRequest extends PageParam {
     //是否归档
     private Integer isFiling;
     //是否删除
-    private Integer deleted;
+    
     //预留字段
     private String lawsA;
     //1:法律2:行政法规3:部门规章4:地方法规5:地方规章
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TMonthlyProjectPurchaseRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TMonthlyProjectPurchaseRequest.java
index 31c08bae..457f4503 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TMonthlyProjectPurchaseRequest.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TMonthlyProjectPurchaseRequest.java
@@ -52,7 +52,7 @@ public class TMonthlyProjectPurchaseRequest extends PageParam {
     
     private String identityId;
     //是否删除
-    private Integer deleted;
+    
     //创建时间
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TOtherArchivesRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TOtherArchivesRequest.java
index 0253330c..4262b48b 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TOtherArchivesRequest.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TOtherArchivesRequest.java
@@ -36,7 +36,7 @@ public class TOtherArchivesRequest extends PageParam {
     //是否是文件夹 0：文件夹 1:文件
     private Integer isDir;
     //是否删除 0：已删除，1：未删除
-    private Integer deleted;
+    
     //是否移到回收站 0：是 1：否
     private Integer isRecycled;
     //ids
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTestPaperAnswerSheetRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTestPaperAnswerSheetRequest.java
index 10a2d0a8..d161eeb6 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTestPaperAnswerSheetRequest.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTestPaperAnswerSheetRequest.java
@@ -5,7 +5,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.module.knowledge.entity.SubmitAnswer;
 import cn.iocoder.yudao.module.knowledge.validated.EditGroup;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTestPaperQuestionStemRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTestPaperQuestionStemRequest.java
index ea637226..d7261b7f 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTestPaperQuestionStemRequest.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTestPaperQuestionStemRequest.java
@@ -2,14 +2,14 @@ package cn.iocoder.yudao.module.knowledge.controller.requestdto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import cn.iocoder.yudao.module.knowledge.validated.EditGroup;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import org.springframework.format.annotation.DateTimeFormat;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
 
 
 /**
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTrainRecordRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTrainRecordRequest.java
index 9aa6e159..6f073364 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTrainRecordRequest.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTrainRecordRequest.java
@@ -8,8 +8,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import org.springframework.format.annotation.DateTimeFormat;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 import java.util.Date;
 
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTrainTeacherRequest.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTrainTeacherRequest.java
index 04d9a0f7..935650e0 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTrainTeacherRequest.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/requestdto/TTrainTeacherRequest.java
@@ -6,8 +6,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import org.springframework.format.annotation.DateTimeFormat;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 
 /**
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TCoursePushVo.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TCoursePushVo.java
index e6e49812..7c2fe00a 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TCoursePushVo.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/controller/responsevo/TCoursePushVo.java
@@ -4,8 +4,8 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.module.knowledge.validated.EditGroup;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springframework.format.annotation.DateTimeFormat;
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TArchives.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TArchives.java
index 3d8c5b16..0545147a 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TArchives.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TArchives.java
@@ -82,11 +82,6 @@ public class TArchives extends BaseDO {
     )
     private Integer isDir;
 
-    @Schema(
-            description = "是否删除 0：已删除，1：未删除",
-            example = "1"
-    )
-    private Integer deleted;
 
     @Schema(
             description = "是否移到回收站 0：是 1：否",
@@ -114,11 +109,6 @@ public class TArchives extends BaseDO {
     @TableField(exist = false)
     private FileInfo fileInfo;
 
-    @TableField(
-            fill = FieldFill.INSERT
-    )
-    @ExcelOut(name = "创建时间", sort = 4, width = 30,dateFormat = "yyyy-MM-dd HH:mm")
-    private Date createTime;
 
 }
 
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TCourseDirectory.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TCourseDirectory.java
index 8b119ccc..5fcda242 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TCourseDirectory.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TCourseDirectory.java
@@ -5,9 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import cn.iocoder.yudao.module.knowledge.handler.IdChainTypeHandler;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.util.List;
@@ -33,6 +32,5 @@ public class TCourseDirectory extends BaseDO {
     @Schema(description = "序号", example = "1")
     private Integer sequence;
 
-    @TableField(typeHandler = IdChainTypeHandler.class)
     private List<Long> idChain;
 }
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TExpert.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TExpert.java
index 1b6a2e59..934cd9e1 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TExpert.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TExpert.java
@@ -73,19 +73,6 @@ public class TExpert extends BaseDO{
 	*/
 	private String post;
 
-	/**
-	* 创建时间
-	*/
-	private Date createTime;
 
-	/**
-	* 更改时间
-	*/
-	private Date updateTime;
-
-	/**
-	* 是否删除 1：已删除，0：未删除
-	*/
-	private Integer deleted;
 
 }
\ No newline at end of file
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TFileInfo.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TFileInfo.java
index cbf0d451..b403b9e7 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TFileInfo.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TFileInfo.java
@@ -49,12 +49,7 @@ public class TFileInfo extends BaseDO {
     @Schema(description = "文件长度", example = "1001")
     private Long fileLenght;
 
-    @TableField(
-            fill = FieldFill.INSERT
-    )
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    private Date createTime;
+
 
     @Schema(description = "绑定Id", example = "1001")
     private Long bindId;
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TLaws.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TLaws.java
index 363719e0..4d87a900 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TLaws.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TLaws.java
@@ -75,13 +75,6 @@ public class TLaws extends BaseDO {
     //1:法律2:行政法规3:部门规章4:地方法规5:地方规章
     private String type;
 
-    @TableField(
-            fill = FieldFill.INSERT
-    )
-    @ExcelOut(name = "创建时间", sort = 6 ,width = 25,dateFormat = "yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    private Date createTime;
 
 }
 
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TMap.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TMap.java
index f1636065..8e2cce88 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TMap.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TMap.java
@@ -32,13 +32,7 @@ public class TMap extends BaseDO {
     @Schema(description = "创建者id", example = "1001")
     private String creatorId;
 
-    @TableField(
-            fill = FieldFill.INSERT
-    )
-    @ExcelOut(name = "创建时间", sort = 6 ,width = 25,dateFormat = "yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    private Date createTime;
+
 
     @Schema(description = "地图图片", example = "1001")
     private String mapImage;
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TMapNode.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TMapNode.java
index 8b92ee48..3746bbdd 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TMapNode.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TMapNode.java
@@ -47,10 +47,7 @@ public class TMapNode extends BaseDO {
     @TableField(
         fill = FieldFill.INSERT
     )
-    @ExcelOut(name = "创建时间", sort = 6 ,width = 25,dateFormat = "yyyy-MM-dd HH:mm")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    private Date createTime;
+
 
     @Schema(description = "父级地图节点", example = "list")
     private Long parentId;
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TOperationDocument.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TOperationDocument.java
index c98c7a9a..1fbaf915 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TOperationDocument.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TOperationDocument.java
@@ -62,21 +62,14 @@ public class TOperationDocument   {
     @ExcelOut(name = "文件路径", sort = 3, width = 20,isFileUrl = true)
     private String url;
 
-    @Schema(description = "创建时间",example = "2024-04-19 15:25:35")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ExcelOut(name = "创建时间", sort = 5, width = 30,dateFormat = "yyyy-MM-dd HH:mm")
-    private Date createTime;
+
 
     @TableField(exist = false)
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date createTimes;
 
-    @Schema(description = "更改时间",example = "2024-04-19 15:25:35")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
 
-    @Schema(description = "文件路径",example = "")
-    private String deleted;
+
 
     @Schema(description = "x/x",example = "")
     private String setx;
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TOtherArchives.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TOtherArchives.java
index f4bee5de..dc202ab1 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TOtherArchives.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TOtherArchives.java
@@ -82,11 +82,8 @@ public class TOtherArchives extends BaseDO {
     )
     private Integer isDir;
 
-    @Schema(
-            description = "是否删除 0：已删除，1：未删除",
-            example = "1"
-    )
-    private Integer deleted;
+
+    
 
     @Schema(
             description = "是否移到回收站 0：是 1：否",
@@ -114,11 +111,7 @@ public class TOtherArchives extends BaseDO {
     @TableField(exist = false)
     private FileInfo fileInfo;
 
-    @TableField(
-            fill = FieldFill.INSERT
-    )
-    @ExcelOut(name = "创建时间", sort = 4, width = 30,dateFormat = "yyyy-MM-dd HH:mm")
-    private Date createTime;
+
 
 }
 
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TQuestionBank.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TQuestionBank.java
index db70dc08..c4b35062 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TQuestionBank.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TQuestionBank.java
@@ -1,6 +1,5 @@
 package cn.iocoder.yudao.module.knowledge.entity;
 
-import cn.iocoder.yudao.module.knowledge.handler.IdChainTypeHandler;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import com.baomidou.mybatisplus.annotation.*;
@@ -32,7 +31,6 @@ public class TQuestionBank extends BaseDO {
     private String name;
 
     private Integer sequence;
-    @TableField(typeHandler = IdChainTypeHandler.class)
     private List<Long> idChain;
 
 }
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TRegulatoryFramework.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TRegulatoryFramework.java
index 559b1420..b5398fc6 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TRegulatoryFramework.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TRegulatoryFramework.java
@@ -56,8 +56,7 @@ public class TRegulatoryFramework extends BaseDO {
     @Schema(description = "是否归档", allowableValues = {"0", "1"}, example = "0")
     private Integer isFiling;
 
-    @Schema(description = "是否删除", allowableValues = {"0", "1"}, example = "0")
-    private Integer deleted;
+
 
     @Schema(description = "预留字段A")
     private String lawsA;
@@ -72,17 +71,7 @@ public class TRegulatoryFramework extends BaseDO {
     @Schema(description = "创建者id", example = "1001")
     private String creatorId;
 
-    @Schema(description = "创建时间", example = "2024-04-15T12:00:00")
-    @TableField(
-            fill = FieldFill.INSERT
-    )
-    @ExcelOut(name = "创建时间", sort = 6 ,width = 25,dateFormat = "yyyy-MM-dd HH:mm")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date createTime;
 
-    @Schema(description = "更改时间", example = "2024-04-15T12:30:00")
-    private Date updateTime;
 
     @Schema(description = "说明", example = "这是一段说明")
     private String describeInfo;
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TRegulatoryFrameworkExecution.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TRegulatoryFrameworkExecution.java
index 557e69fb..73dd5d91 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TRegulatoryFrameworkExecution.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TRegulatoryFrameworkExecution.java
@@ -50,14 +50,7 @@ public class TRegulatoryFrameworkExecution   extends BaseDO  {
     @Schema(description = "",example = "")
     private String creatorId;
 
-    @Schema(description = "",example = "2024-04-19 15:25:35")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ExcelOut(name = "创建时间", sort = 3, width = 30,dateFormat = "yyyy-MM-dd HH:mm")
-    private Date createTime;
 
-    @Schema(description = "",example = "2024-04-19 15:25:35")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
 
     @Schema(description = "",example = "")
     @TableField(exist = false)
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TRfeUser.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TRfeUser.java
index b36d079d..2581b1be 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TRfeUser.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TRfeUser.java
@@ -38,8 +38,8 @@ public class TRfeUser  {
     @Schema(description = "",example = "")
     private String state;
 
-    @Schema(description = "",example = "")
-    private Integer deleted;
+
+    
 
     @Schema(description = "",example = "")
     private String creator;
@@ -47,12 +47,4 @@ public class TRfeUser  {
     @Schema(description = "",example = "")
     private String creatorId;
 
-    @Schema(description = "",example = "2024-04-19 15:25:35")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    @Schema(description = "",example = "2024-04-19 15:25:35")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private String updateTime;
-
 }
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TSpecialist.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TSpecialist.java
index 0c63a2cc..1fac2d00 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TSpecialist.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/entity/TSpecialist.java
@@ -69,14 +69,7 @@ public class TSpecialist extends BaseDO{
     @Schema(description = "",example = "")
     private Long expertId;
 
-    @Schema(description = "",example = "")
-    private Date createTime;
 
-    @Schema(description = "",example = "")
-    private Date updateTime;
-
-    @Schema(description = "",example = "")
-    private Integer deleted;
     @ExcelOut(name = "领域专家", sort = 8, width = 20)
     @TableField(exist = false)
     private String tagName;
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TArchivesMapper.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TArchivesMapper.java
index 7c19ce05..b9b239d3 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TArchivesMapper.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TArchivesMapper.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.knowledge.dao;
+package cn.iocoder.yudao.module.knowledge.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TFileInfoMapper.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TFileInfoMapper.java
index 1978686d..6bc0e501 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TFileInfoMapper.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TFileInfoMapper.java
@@ -1,12 +1,7 @@
-package cn.iocoder.yudao.module.knowledge.dao;
+package cn.iocoder.yudao.module.knowledge.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import cn.iocoder.yudao.module.knowledge.controller.requestdto.TOperaDocPage;
 import cn.iocoder.yudao.module.knowledge.entity.TFileInfo;
-import cn.iocoder.yudao.module.knowledge.entity.TOperationDocument;
-import cn.iocoder.yudao.module.knowledge.entity.TProductRawMaterials;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TLawsMapper.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TLawsMapper.java
index 0d0c032c..ae6a1f01 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TLawsMapper.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TLawsMapper.java
@@ -1,12 +1,10 @@
-package cn.iocoder.yudao.module.knowledge.dao;
+package cn.iocoder.yudao.module.knowledge.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import cn.iocoder.yudao.module.knowledge.controller.requestdto.DeleteRequest;
 import cn.iocoder.yudao.module.knowledge.controller.requestdto.TLawsRequest;
 import cn.iocoder.yudao.module.knowledge.entity.TLaws;
-import cn.iocoder.yudao.module.knowledge.entity.TLawsRecord;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TLawsRecordMapper.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TLawsRecordMapper.java
index eebb06bf..e1302570 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TLawsRecordMapper.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TLawsRecordMapper.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.knowledge.dao;
+package cn.iocoder.yudao.module.knowledge.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import cn.iocoder.yudao.module.knowledge.entity.TLawsRecord;
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TRegulatoryFrameworkExecutionMapper.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TRegulatoryFrameworkExecutionMapper.java
index cbb5eda0..6bf19011 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TRegulatoryFrameworkExecutionMapper.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TRegulatoryFrameworkExecutionMapper.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.knowledge.dao;
+package cn.iocoder.yudao.module.knowledge.mapper;
 
 import cn.iocoder.yudao.module.knowledge.controller.requestdto.MonitorRequestPage;
 import cn.iocoder.yudao.module.knowledge.entity.RfeuTaskContent;
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TRegulatoryFrameworkMapper.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TRegulatoryFrameworkMapper.java
index 0af5f59c..6d40406d 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TRegulatoryFrameworkMapper.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TRegulatoryFrameworkMapper.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.knowledge.dao;
+package cn.iocoder.yudao.module.knowledge.mapper;
 
 import cn.iocoder.yudao.module.knowledge.controller.requestdto.TRegulatoryFrameworkRequest;
 import cn.iocoder.yudao.module.knowledge.entity.TRegulatoryFramework;
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TRegulatoryFrameworkRecordMapper.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TRegulatoryFrameworkRecordMapper.java
index e17d321f..379d1bf5 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TRegulatoryFrameworkRecordMapper.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TRegulatoryFrameworkRecordMapper.java
@@ -1,4 +1,4 @@
-package cn.iocoder.yudao.module.knowledge.dao;
+package cn.iocoder.yudao.module.knowledge.mapper;
 
 import cn.iocoder.yudao.module.knowledge.entity.TRegulatoryFrameworkRecord;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TViolationImageMapper.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TViolationImageMapper.java
index bc67f3d6..3fb638a5 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TViolationImageMapper.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TViolationImageMapper.java
@@ -1,7 +1,6 @@
-package cn.iocoder.yudao.module.knowledge.dao;
+package cn.iocoder.yudao.module.knowledge.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import cn.iocoder.yudao.module.knowledge.entity.TLawsRecord;
 import cn.iocoder.yudao.module.knowledge.entity.TViolationImage;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TViolationMapper.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TViolationMapper.java
index ecc0ffb2..1f5352d2 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TViolationMapper.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/mapper/TViolationMapper.java
@@ -1,13 +1,12 @@
-package cn.iocoder.yudao.module.knowledge.dao;
+package cn.iocoder.yudao.module.knowledge.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import cn.iocoder.yudao.module.knowledge.controller.requestdto.TLawsRequest;
 import cn.iocoder.yudao.module.knowledge.controller.requestdto.TViolationRequest;
-import cn.iocoder.yudao.module.knowledge.entity.TLaws;
 import cn.iocoder.yudao.module.knowledge.entity.TViolation;
 import cn.iocoder.yudao.module.knowledge.entity.TViolationImage;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,6 +17,7 @@ import java.util.List;
  * @author makejava
  * @since 2024-04-13 14:58:19
  */
+@Mapper
 public interface TViolationMapper extends BaseMapper<TViolation> {
 
     IPage<TViolation> getListPage(Page<TViolation> page, @Param("dto") TViolationRequest dto);
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TArchivesService.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TArchivesService.java
index 9988c72f..a4987011 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TArchivesService.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TArchivesService.java
@@ -12,7 +12,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import cn.iocoder.yudao.module.knowledge.constants.CodeEnum;
 import cn.iocoder.yudao.module.knowledge.controller.requestdto.TArchivesRequest;
-import cn.iocoder.yudao.module.knowledge.dao.TArchivesMapper;
+import cn.iocoder.yudao.module.knowledge.mapper.TArchivesMapper;
 import cn.iocoder.yudao.module.knowledge.entity.TArchives;
 import cn.iocoder.yudao.module.knowledge.utils.FileTypeUtils;
 import cn.iocoder.yudao.module.knowledge.utils.MimeTypeUtils;
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TFileInfoService.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TFileInfoService.java
index b8f15b09..5c0214b2 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TFileInfoService.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TFileInfoService.java
@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.knowledge.service;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import cn.iocoder.yudao.module.knowledge.dao.TFileInfoMapper;
+import cn.iocoder.yudao.module.knowledge.mapper.TFileInfoMapper;
 import cn.iocoder.yudao.module.knowledge.entity.*;
 import org.springframework.stereotype.Service;
 
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TLawsRecordService.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TLawsRecordService.java
index 9f54275e..3ff58d1e 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TLawsRecordService.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TLawsRecordService.java
@@ -1,7 +1,7 @@
 package cn.iocoder.yudao.module.knowledge.service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import cn.iocoder.yudao.module.knowledge.dao.TLawsRecordMapper;
+import cn.iocoder.yudao.module.knowledge.mapper.TLawsRecordMapper;
 
 import cn.iocoder.yudao.module.knowledge.entity.TLawsRecord;
 import org.springframework.stereotype.Service;
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TLawsService.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TLawsService.java
index e8fa7d8f..04d5af01 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TLawsService.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TLawsService.java
@@ -1,23 +1,19 @@
 package cn.iocoder.yudao.module.knowledge.service;
 
 import cn.hutool.core.date.DateUtil;
+import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
+import cn.iocoder.yudao.module.knowledge.constants.Result;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.chalco.zlzn.fr.basic.common.config.ContextGetUtil;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import cn.iocoder.yudao.module.knowledge.constants.CodeEnum;
-import cn.iocoder.yudao.module.knowledge.controller.requestdto.DeleteRequest;
 import cn.iocoder.yudao.module.knowledge.controller.requestdto.TArchivesRequest;
 import cn.iocoder.yudao.module.knowledge.controller.requestdto.TLawsRequest;
-import cn.iocoder.yudao.module.knowledge.dao.TLawsMapper;
-import cn.iocoder.yudao.module.knowledge.entity.TArchives;
+import cn.iocoder.yudao.module.knowledge.mapper.TLawsMapper;
 import cn.iocoder.yudao.module.knowledge.entity.TLaws;
 import cn.iocoder.yudao.module.knowledge.entity.TLawsRecord;
-import cn.iocoder.yudao.module.knowledge.entity.TRegulatoryFramework;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -85,7 +81,7 @@ public class TLawsService extends ServiceImpl<TLawsMapper, TLaws> {
                 saveData.setLawsId(old.getId());
                 saveData.setFilingTime(new Date());
                 saveData.setId(null);
-                saveData.setCreatorId(ContextGetUtil.getIdentityId());
+                saveData.setCreatorId(SecurityFrameworkUtils.getLoginUserId().toString());
                 saveData.setCreator(SecurityFrameworkUtils.getLoginUserNickname());
                 recordService.save(saveData);
                 // 通信法律法规文件夹
@@ -111,7 +107,6 @@ public class TLawsService extends ServiceImpl<TLawsMapper, TLaws> {
             TLaws data =new TLaws();
             BeanUtils.copyProperties(tLaws,data);
             data.setCode(generateRandomString());
-            data.setCreatorId(ContextGetUtil.getIdentityId());
             data.setCreator(SecurityFrameworkUtils.getLoginUserNickname());
             baseMapper.insert(data);
         }
@@ -177,7 +172,7 @@ public class TLawsService extends ServiceImpl<TLawsMapper, TLaws> {
         saveData.setId(null);
         saveData.setLawsId(old.getId());
         saveData.setFilingTime(new Date());
-        saveData.setCreatorId(ContextGetUtil.getIdentityId());
+        saveData.setCreatorId(SecurityFrameworkUtils.getLoginUserId().toString());
         saveData.setCreator(SecurityFrameworkUtils.getLoginUserNickname());
         recordService.save(saveData);
         // 通信法律法规文件夹
@@ -266,7 +261,6 @@ public class TLawsService extends ServiceImpl<TLawsMapper, TLaws> {
         for (TLaws record : records) {
             String format = simpleDateFormat.format(record.getCreateTime());
             Date date = simpleDateFormat.parse(format);
-            record.setCreateTime(date);
         }
         return tLawsIPage;
     }
@@ -306,7 +300,7 @@ public class TLawsService extends ServiceImpl<TLawsMapper, TLaws> {
                 saveData.setLawsId(old.getId());
                 saveData.setFilingTime(new Date());
                 saveData.setId(null);
-                saveData.setCreatorId(ContextGetUtil.getIdentityId());
+                saveData.setCreatorId(SecurityFrameworkUtils.getLoginUserId().toString());
                 saveData.setCreator(SecurityFrameworkUtils.getLoginUserNickname());
                 recordService.save(saveData);
                 // 通信法律法规文件夹
@@ -332,7 +326,6 @@ public class TLawsService extends ServiceImpl<TLawsMapper, TLaws> {
             TLaws data =new TLaws();
             BeanUtils.copyProperties(tLaws,data);
             data.setCode(generateRandomString());
-            data.setCreatorId(ContextGetUtil.getIdentityId());
             data.setCreator(SecurityFrameworkUtils.getLoginUserNickname());
             baseMapper.insert(data);
         }
@@ -397,7 +390,7 @@ public class TLawsService extends ServiceImpl<TLawsMapper, TLaws> {
         saveData.setId(null);
         saveData.setLawsId(old.getId());
         saveData.setFilingTime(new Date());
-        saveData.setCreatorId(ContextGetUtil.getIdentityId());
+        saveData.setCreatorId(SecurityFrameworkUtils.getLoginUserId().toString());
         saveData.setCreator(SecurityFrameworkUtils.getLoginUserNickname());
         recordService.save(saveData);
         // 通信法律法规文件夹
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TRegulatoryFrameworkRecordsService.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TRegulatoryFrameworkRecordsService.java
index 1a70befc..0d775911 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TRegulatoryFrameworkRecordsService.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TRegulatoryFrameworkRecordsService.java
@@ -1,10 +1,9 @@
-package com.chalco.zlzn.server.providerknowledge.service;
+package cn.iocoder.yudao.module.knowledge.service;
 
+import cn.iocoder.yudao.module.knowledge.mapper.TRegulatoryFrameworkRecordMapper;
+import cn.iocoder.yudao.module.knowledge.entity.TRegulatoryFrameworkRecord;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.chalco.zlzn.server.providerknowledge.dao.TLawsRecordMapper;
-import com.chalco.zlzn.server.providerknowledge.dao.TRegulatoryFrameworkRecordMapper;
-import com.chalco.zlzn.server.providerknowledge.entity.TLawsRecord;
-import com.chalco.zlzn.server.providerknowledge.entity.TRegulatoryFrameworkRecord;
+
 import org.springframework.stereotype.Service;
 
 @Service
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TRegulatoryFrameworkService.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TRegulatoryFrameworkService.java
index 7bbc0619..150dd5b1 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TRegulatoryFrameworkService.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TRegulatoryFrameworkService.java
@@ -1,31 +1,33 @@
-package com.chalco.zlzn.server.providerknowledge.service;
+package cn.iocoder.yudao.module.knowledge.service;
 
 import cn.hutool.core.date.DateUtil;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
+import cn.iocoder.yudao.module.knowledge.constants.CodeEnum;
+import cn.iocoder.yudao.module.knowledge.constants.Result;
+import cn.iocoder.yudao.module.knowledge.controller.requestdto.TArchivesRequest;
+import cn.iocoder.yudao.module.knowledge.controller.requestdto.TRegulatoryFrameworkRequest;
+import cn.iocoder.yudao.module.knowledge.mapper.TRegulatoryFrameworkMapper;
+import cn.iocoder.yudao.module.knowledge.entity.TRegulatoryFramework;
+import cn.iocoder.yudao.module.knowledge.entity.TRegulatoryFrameworkRecord;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.chalco.zlzn.fr.basic.common.config.ContextGetUtil;
-import com.chalco.zlzn.fr.basic.common.constants.Result;
-import com.chalco.zlzn.fr.starter.mybatis.handle.BaseDO;
-;
-import com.chalco.zlzn.server.providerknowledge.constants.CodeEnum;
-import com.chalco.zlzn.server.providerknowledge.controller.requestdto.TArchivesRequest;
-import com.chalco.zlzn.server.providerknowledge.controller.requestdto.TRegulatoryFrameworkRequest;
-import com.chalco.zlzn.server.providerknowledge.dao.TRegulatoryFrameworkMapper;
-import com.chalco.zlzn.server.providerknowledge.entity.*;
+
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Random;
 
+;
+
 /**
  * 规章制度表(TRegulatoryFramework)表服务实现类
  *
@@ -78,8 +80,8 @@ public class TRegulatoryFrameworkService extends ServiceImpl<TRegulatoryFramewor
                 saveData.setLawsId(old.getId());
                 saveData.setFilingTime(new Date());
                 saveData.setId(null);
-                saveData.setCreatorId(ContextGetUtil.getIdentityId());
-                saveData.setCreator(ContextGetUtil.getNickname());
+                saveData.setCreatorId(SecurityFrameworkUtils.getLoginUserId().toString());
+                saveData.setCreator(SecurityFrameworkUtils.getLoginUserNickname());
                 recordService.save(saveData);
                 noticeFolder(old,193l,"1");
             }
@@ -96,9 +98,6 @@ public class TRegulatoryFrameworkService extends ServiceImpl<TRegulatoryFramewor
             BeanUtils.copyProperties(regulatoryFrameworkRequest,data);
             data.setCode(generateRandomString());
             data.setIsFiling(0);
-            data.setDeleted(0);
-            data.setCreatorId(ContextGetUtil.getIdentityId());
-            data.setCreator(ContextGetUtil.getNickname());
             baseMapper.insert(data);
            // noticeFolder(data,193l,"0");
         }
@@ -146,8 +145,8 @@ public class TRegulatoryFrameworkService extends ServiceImpl<TRegulatoryFramewor
         saveData.setId(null);
         saveData.setLawsId(old.getId());
         saveData.setFilingTime(new Date());
-        saveData.setCreatorId(ContextGetUtil.getIdentityId());
-        saveData.setCreator(ContextGetUtil.getNickname());
+        saveData.setCreatorId(SecurityFrameworkUtils.getLoginUserId().toString());
+        saveData.setCreator(SecurityFrameworkUtils.getLoginUserNickname());
         recordService.save(saveData);
         noticeFolder(old,193l,"1");
 
@@ -255,7 +254,7 @@ public class TRegulatoryFrameworkService extends ServiceImpl<TRegulatoryFramewor
         for (TRegulatoryFramework record : records) {
             String format = simpleDateFormat.format(record.getCreateTime());
             Date date = simpleDateFormat.parse(format);
-            record.setCreateTime(date);
+
         }
         return tRegulatoryFrameworkIPage;
     }
@@ -292,8 +291,8 @@ public class TRegulatoryFrameworkService extends ServiceImpl<TRegulatoryFramewor
                 saveData.setLawsId(old.getId());
                 saveData.setFilingTime(new Date());
                 saveData.setId(null);
-                saveData.setCreatorId(ContextGetUtil.getIdentityId());
-                saveData.setCreator(ContextGetUtil.getNickname());
+                saveData.setCreatorId(SecurityFrameworkUtils.getLoginUserId().toString());
+                saveData.setCreator(SecurityFrameworkUtils.getLoginUserNickname());
                 recordService.save(saveData);
                 noticeFolder(old,193l,"1");
             }
@@ -310,9 +309,6 @@ public class TRegulatoryFrameworkService extends ServiceImpl<TRegulatoryFramewor
             BeanUtils.copyProperties(regulatoryFrameworkRequest,data);
             data.setCode(generateRandomString());
             data.setIsFiling(0);
-            data.setDeleted(0);
-            data.setCreatorId(ContextGetUtil.getIdentityId());
-            data.setCreator(ContextGetUtil.getNickname());
             baseMapper.insert(data);
            // noticeFolder(data,193l,"0");
         }
@@ -359,8 +355,8 @@ public class TRegulatoryFrameworkService extends ServiceImpl<TRegulatoryFramewor
         saveData.setId(null);
         saveData.setLawsId(old.getId());
         saveData.setFilingTime(new Date());
-        saveData.setCreatorId(ContextGetUtil.getIdentityId());
-        saveData.setCreator(ContextGetUtil.getNickname());
+        saveData.setCreatorId(SecurityFrameworkUtils.getLoginUserId().toString());
+        saveData.setCreator(SecurityFrameworkUtils.getLoginUserNickname());
         recordService.save(saveData);
         noticeFolder(old,193l,"1");
 
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TViolationImageService.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TViolationImageService.java
index 17692841..d0b00dec 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TViolationImageService.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TViolationImageService.java
@@ -1,10 +1,7 @@
 package cn.iocoder.yudao.module.knowledge.service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import cn.iocoder.yudao.module.knowledge.dao.TLawsRecordMapper;
-import cn.iocoder.yudao.module.knowledge.dao.TViolationImageMapper;
-import cn.iocoder.yudao.module.knowledge.dao.TViolationMapper;
-import cn.iocoder.yudao.module.knowledge.entity.TLawsRecord;
+import cn.iocoder.yudao.module.knowledge.mapper.TViolationImageMapper;
 import cn.iocoder.yudao.module.knowledge.entity.TViolationImage;
 import org.springframework.stereotype.Service;
 
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TViolationService.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TViolationService.java
index 8c279f98..9e737b05 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TViolationService.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/service/TViolationService.java
@@ -1,30 +1,19 @@
 package cn.iocoder.yudao.module.knowledge.service;
 
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.knowledge.constants.Result;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
-import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
-import cn.iocoder.yudao.module.knowledge.constants.CodeEnum;
-import cn.iocoder.yudao.module.knowledge.controller.requestdto.BidManagementRequest;
 import cn.iocoder.yudao.module.knowledge.controller.requestdto.TArchivesRequest;
-import cn.iocoder.yudao.module.knowledge.controller.requestdto.TLawsRequest;
 import cn.iocoder.yudao.module.knowledge.controller.requestdto.TViolationRequest;
-import cn.iocoder.yudao.module.knowledge.dao.TViolationImageMapper;
+import cn.iocoder.yudao.module.knowledge.mapper.TViolationImageMapper;
 import cn.iocoder.yudao.module.knowledge.entity.TViolation;
-import cn.iocoder.yudao.module.knowledge.entity.TLawsRecord;
 import cn.iocoder.yudao.module.knowledge.entity.TViolationImage;
-import cn.iocoder.yudao.module.knowledge.dao.TViolationMapper;
+import cn.iocoder.yudao.module.knowledge.mapper.TViolationMapper;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/utils/ExcelUtils.java b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/utils/ExcelUtils.java
index 6ed9bb74..50dd44fd 100644
--- a/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/utils/ExcelUtils.java
+++ b/dl-module-knowledge/src/main/java/cn/iocoder/yudao/module/knowledge/utils/ExcelUtils.java
@@ -33,21 +33,14 @@ import java.util.List;
 @Slf4j
 @Component
 public class ExcelUtils {
-    @Value("${request_prefix}")
-    private String request_prefix;
-    @Value("${request_token}")
-    private String request_token;
 
-    private String token_prefix = "&Authorization=Bearer ";
+
+
 
 
     public static String PRIVATE_KEY;
     public static String REQUEST_TOKEN;
-    @PostConstruct
-    public void init() {
-        PRIVATE_KEY = this.request_prefix;
-        REQUEST_TOKEN = this.token_prefix + this.request_token;
-    }
+
 
     private final static Logger logger = LoggerFactory.getLogger(ExcelUtils.class);
 
diff --git a/dl-module-knowledge/src/main/resources/mapper/KnowledgeStatisticsMapper.xml b/dl-module-knowledge/src/main/resources/mapper/KnowledgeStatisticsMapper.xml
index 6d6d4dc2..55a6f48a 100644
--- a/dl-module-knowledge/src/main/resources/mapper/KnowledgeStatisticsMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/KnowledgeStatisticsMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.KnowledgeStatisticsMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.KnowledgeStatisticsMapper">
     <resultMap id="BaseResultMap" type="cn.iocoder.yudao.module.knowledge.entity.TLaws">
         <id column="ID" property="id" jdbcType="BIGINT"/>
         <result column="CODE" property="code" jdbcType="VARCHAR"/>
diff --git a/dl-module-knowledge/src/main/resources/mapper/RRfeuTaskFileMapper.xml b/dl-module-knowledge/src/main/resources/mapper/RRfeuTaskFileMapper.xml
index 34f46d13..d092d5bd 100644
--- a/dl-module-knowledge/src/main/resources/mapper/RRfeuTaskFileMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/RRfeuTaskFileMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.RRfeuTaskFileMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.RRfeuTaskFileMapper">
 
     <resultMap type="cn.iocoder.yudao.module.knowledge.entity.RRfeuTaskFile" id="rRfeuTaskFileMap">
             <result property="id" column="id"/>
diff --git a/dl-module-knowledge/src/main/resources/mapper/RfeuTaskContentMapper.xml b/dl-module-knowledge/src/main/resources/mapper/RfeuTaskContentMapper.xml
index 6fd8fa9a..c3358f28 100644
--- a/dl-module-knowledge/src/main/resources/mapper/RfeuTaskContentMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/RfeuTaskContentMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.RfeuTaskContentMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.RfeuTaskContentMapper">
 
     <select id="getListBy" resultType="cn.iocoder.yudao.module.knowledge.entity.RfeuTaskContent"
             parameterType="java.lang.Long">
diff --git a/dl-module-knowledge/src/main/resources/mapper/TArchivesMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TArchivesMapper.xml
index 43889d28..b1fe3693 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TArchivesMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TArchivesMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TArchivesMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TArchivesMapper">
 
 
     <select id="selectTArchivesList" parameterType="cn.iocoder.yudao.module.knowledge.entity.TArchives"
diff --git a/dl-module-knowledge/src/main/resources/mapper/TBidConfirmationCandidateMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TBidConfirmationCandidateMapper.xml
index 10b4c66d..c017eddc 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TBidConfirmationCandidateMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TBidConfirmationCandidateMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TBidConfirmationCandidateMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TBidConfirmationCandidateMapper">
 
 
     <select id="selectByConfirmId" resultType="cn.iocoder.yudao.module.knowledge.entity.TBidConfirmationCandidate">
diff --git a/dl-module-knowledge/src/main/resources/mapper/TBidConfirmationMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TBidConfirmationMapper.xml
index 15de4111..41a0452d 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TBidConfirmationMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TBidConfirmationMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TBidConfirmationMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TBidConfirmationMapper">
 
     <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TBidConfirmation" id="tBidConfirmationMap">
         <result property="id" column="id"/>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TBidPlanMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TBidPlanMapper.xml
index 71f494a7..7021e545 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TBidPlanMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TBidPlanMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TBidPlanMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TBidPlanMapper">
 
     <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TBidPlan" id="tBidPlanMap">
         <result property="id" column="id"/>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TCourseMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TCourseMapper.xml
index 0346a2c5..8f9f50f9 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TCourseMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TCourseMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TCourseMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TCourseMapper">
 
     <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TCourse" id="tCourseMap">
         <result property="id" column="id"/>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TCoursePushMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TCoursePushMapper.xml
index ce124445..a9e2bd02 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TCoursePushMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TCoursePushMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TCoursePushMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TCoursePushMapper">
 
     <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TCoursePush" id="tCoursePushMap">
             <result property="id" column="id"/>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TCourseRecordsMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TCourseRecordsMapper.xml
index 3f509c7b..637e5585 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TCourseRecordsMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TCourseRecordsMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TCourseRecordsMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TCourseRecordsMapper">
 
     <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TCourseRecords" id="tCourseRecordsMap">
             <result property="id" column="id"/>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TCoursewareMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TCoursewareMapper.xml
index 00affbdc..b138a16e 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TCoursewareMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TCoursewareMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TCoursewareMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TCoursewareMapper">
 
     <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TCourseware" id="tCoursewareMap">
         <result property="id" column="id"/>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TExpertMaintenanceMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TExpertMaintenanceMapper.xml
index 5b4f7cb6..41e7bd49 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TExpertMaintenanceMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TExpertMaintenanceMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TExpertMaintenanceMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TExpertMaintenanceMapper">
 
     <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TExpertMaintenance" id="tExpertMaintenanceMap">
             <result property="id" column="id"/>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TExpertMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TExpertMapper.xml
index d546b205..77988324 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TExpertMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TExpertMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TExpertMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TExpertMapper">
 
     <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TExpert" id="tExpertMap">
             <result property="id" column="id"/>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TExpertZoneCollectionMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TExpertZoneCollectionMapper.xml
index 484a9002..1f245085 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TExpertZoneCollectionMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TExpertZoneCollectionMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TExpertZoneCollectionMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TExpertZoneCollectionMapper">
 
     <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TExpertZoneCollection" id="tExpertZoneCollectionMap">
             <result property="id" column="id"/>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TExpertZoneCommentMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TExpertZoneCommentMapper.xml
index 7f223747..69bc67e9 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TExpertZoneCommentMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TExpertZoneCommentMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TExpertZoneCommentMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TExpertZoneCommentMapper">
 
     <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TExpertZoneComment" id="tExpertZoneCommentMap">
             <result property="id" column="id"/>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TExpertZoneMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TExpertZoneMapper.xml
index 34a84f05..4558c513 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TExpertZoneMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TExpertZoneMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TExpertZoneMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TExpertZoneMapper">
 
     <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TExpertZone" id="tExpertZoneMap">
             <result property="id" column="id"/>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TFileInfoMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TFileInfoMapper.xml
index 64a66a32..4d74dd2f 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TFileInfoMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TFileInfoMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TFileInfoMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TFileInfoMapper">
 
 
     <select id="selectByPlanId" resultType="cn.iocoder.yudao.module.knowledge.entity.TFileInfo">
diff --git a/dl-module-knowledge/src/main/resources/mapper/TLawsMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TLawsMapper.xml
index 886d0e48..2d2e8008 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TLawsMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TLawsMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TLawsMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TLawsMapper">
     <resultMap id="BaseResultMap" type="cn.iocoder.yudao.module.knowledge.entity.TLaws">
         <id column="ID" property="id" jdbcType="BIGINT"/>
         <result column="CODE" property="code" jdbcType="VARCHAR"/>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TMapImageMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TMapImageMapper.xml
index 86c418d0..62019b6c 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TMapImageMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TMapImageMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TMapImageMapper" >
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TMapImageMapper" >
 
 
   <select id="selectByMapId" resultType="cn.iocoder.yudao.module.knowledge.entity.TMapImage">
diff --git a/dl-module-knowledge/src/main/resources/mapper/TMapMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TMapMapper.xml
index 5adaade1..e38d2b66 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TMapMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TMapMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TMapMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TMapMapper">
 
 
     <select id="getListPage" resultType="cn.iocoder.yudao.module.knowledge.entity.TMap">
diff --git a/dl-module-knowledge/src/main/resources/mapper/TMapNodeMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TMapNodeMapper.xml
index 7ea7e5e0..6368f5a2 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TMapNodeMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TMapNodeMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TMapNodeMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TMapNodeMapper">
 
 
     <select id="selectByMapId" resultType="cn.iocoder.yudao.module.knowledge.entity.TMapNode">
diff --git a/dl-module-knowledge/src/main/resources/mapper/TMonthlyProjectPurchaseMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TMonthlyProjectPurchaseMapper.xml
index 9017da4c..ca778e94 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TMonthlyProjectPurchaseMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TMonthlyProjectPurchaseMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TMonthlyProjectPurchaseMapper" >
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TMonthlyProjectPurchaseMapper" >
 
     <!-- 用于select查询公用抽取的列 -->
     <sql id="columns">
diff --git a/dl-module-knowledge/src/main/resources/mapper/TNotProcurementBidMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TNotProcurementBidMapper.xml
index c6d5ed09..6418f31b 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TNotProcurementBidMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TNotProcurementBidMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TNotProcurementBidMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TNotProcurementBidMapper">
 
 
     <select id="selectByPlanId" resultType="cn.iocoder.yudao.module.knowledge.entity.TNotProcurementBid">
diff --git a/dl-module-knowledge/src/main/resources/mapper/TOperaDocMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TOperaDocMapper.xml
index b931679d..c8389c3b 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TOperaDocMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TOperaDocMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TOperaDocMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TOperaDocMapper">
 
     <sql id="column">
         id,cn_name,en_name,version,file_code,file_name,qr_code,tag,create_time,update_time,url,setx,file_size
diff --git a/dl-module-knowledge/src/main/resources/mapper/TOperationProCoreMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TOperationProCoreMapper.xml
index 5fddbc2a..e6e31dd7 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TOperationProCoreMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TOperationProCoreMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TOperationProCoreMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TOperationProCoreMapper">
 
 
 <update id="updateByCode">
diff --git a/dl-module-knowledge/src/main/resources/mapper/TOperationProMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TOperationProMapper.xml
index 7691ed87..082f0518 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TOperationProMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TOperationProMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TOperationProMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TOperationProMapper">
 
 <update id="updateByCode">
         UPDATE t_operation_procedure
diff --git a/dl-module-knowledge/src/main/resources/mapper/TOtherArchivesMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TOtherArchivesMapper.xml
index 91d29022..1570120f 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TOtherArchivesMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TOtherArchivesMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TOtherArchivesMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TOtherArchivesMapper">
 
 
     <select id="selectTArchivesList" parameterType="cn.iocoder.yudao.module.knowledge.entity.TOtherArchives"
diff --git a/dl-module-knowledge/src/main/resources/mapper/TProcurementBidMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TProcurementBidMapper.xml
index a3046190..24d3db01 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TProcurementBidMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TProcurementBidMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TProcurementBidMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TProcurementBidMapper">
 
 
     <select id="selectByPlanId" resultType="cn.iocoder.yudao.module.knowledge.entity.TProcurementBid">
diff --git a/dl-module-knowledge/src/main/resources/mapper/TProductRawMaterialsMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TProductRawMaterialsMapper.xml
index aceeee06..8bd0116e 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TProductRawMaterialsMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TProductRawMaterialsMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TProductRawMatMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TProductRawMatMapper">
 
 
     <update id="updateByCode">
diff --git a/dl-module-knowledge/src/main/resources/mapper/TQuestionAnswersMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TQuestionAnswersMapper.xml
index 5437fdf8..12ab908d 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TQuestionAnswersMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TQuestionAnswersMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TQuestionAnswersMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TQuestionAnswersMapper">
 
     <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TQuestionAnswers" id="tQuestionAnswersMap">
         <result property="id" column="id"/>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TQuestionStemMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TQuestionStemMapper.xml
index a7785d6d..ab9112ed 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TQuestionStemMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TQuestionStemMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TQuestionStemMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TQuestionStemMapper">
 
     <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TQuestionStem" id="tQuestionStemMaps">
         <result property="id" column="id"/>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TRegulartoryFrameworkExecutionMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TRegulartoryFrameworkExecutionMapper.xml
index 13fdce06..2f39cfc6 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TRegulartoryFrameworkExecutionMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TRegulartoryFrameworkExecutionMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TRegulatoryFrameworkExecutionMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TRegulatoryFrameworkExecutionMapper">
 
 
     <select id="selectPageMonitor" parameterType="cn.iocoder.yudao.module.knowledge.controller.requestdto.MonitorRequestPage"
diff --git a/dl-module-knowledge/src/main/resources/mapper/TRegulatoryFrameworkMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TRegulatoryFrameworkMapper.xml
index 5d316a93..2937fc45 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TRegulatoryFrameworkMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TRegulatoryFrameworkMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TRegulatoryFrameworkMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TRegulatoryFrameworkMapper">
 
     <sql id="column">
         id,CODE,NAME,version,file_url,file_size,file_name,filing_time,is_filing,deleted,laws_a,laws_b,creator,creator_id,create_time,update_time,dept_id,identity_id,describe_info,tenant_id,type
diff --git a/dl-module-knowledge/src/main/resources/mapper/TRevisionMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TRevisionMapper.xml
index baf1253b..fcf2f5dd 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TRevisionMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TRevisionMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TRevisionMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TRevisionMapper">
 
 <update id="updateByCode">
         UPDATE t_revision
diff --git a/dl-module-knowledge/src/main/resources/mapper/TRfeContentMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TRfeContentMapper.xml
index c6e29a6a..60ed7557 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TRfeContentMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TRfeContentMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TRfeContentMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TRfeContentMapper">
 
 <update id="updateById">
         UPDATE t_rfe_content
diff --git a/dl-module-knowledge/src/main/resources/mapper/TRfeUserMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TRfeUserMapper.xml
index 02ba99a6..8eaa26d7 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TRfeUserMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TRfeUserMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TRfeUserMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TRfeUserMapper">
 
 <update id="updateByCode">
         UPDATE t_rfe_user
diff --git a/dl-module-knowledge/src/main/resources/mapper/TRfeuTaskMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TRfeuTaskMapper.xml
index d1edd22c..4cc6228b 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TRfeuTaskMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TRfeuTaskMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TRfeuTaskMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TRfeuTaskMapper">
 
 <update id="updateByCode">
         UPDATE t_rfeu_task
diff --git a/dl-module-knowledge/src/main/resources/mapper/TSpecialistMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TSpecialistMapper.xml
index 203f0698..38079f4a 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TSpecialistMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TSpecialistMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TSpecialistMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TSpecialistMapper">
 
 
     <select id="selectPageTS" parameterType="cn.iocoder.yudao.module.knowledge.controller.requestdto.ExpertRequestPage"
diff --git a/dl-module-knowledge/src/main/resources/mapper/TTestPaperAnswerSheetMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TTestPaperAnswerSheetMapper.xml
index aa768c79..e831e714 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TTestPaperAnswerSheetMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TTestPaperAnswerSheetMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TTestPaperAnswerSheetMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TTestPaperAnswerSheetMapper">
 
     <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TTestPaperAnswerSheet"
                id="tTestPaperAnswerSheetMap">
diff --git a/dl-module-knowledge/src/main/resources/mapper/TTestPaperInfoMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TTestPaperInfoMapper.xml
index e47fb685..2d975331 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TTestPaperInfoMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TTestPaperInfoMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TTestPaperInfoMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TTestPaperInfoMapper">
 
     <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TTestPaperInfo" id="tTestPaperInfoMap">
         <result property="id" column="id"/>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TTestPaperQuestionStemMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TTestPaperQuestionStemMapper.xml
index 1e720b36..0c90d576 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TTestPaperQuestionStemMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TTestPaperQuestionStemMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TTestPaperQuestionStemMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TTestPaperQuestionStemMapper">
 
     <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TTestPaperQuestionStem"
                id="tTestPaperQuestionStemMap">
diff --git a/dl-module-knowledge/src/main/resources/mapper/TTrainMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TTrainMapper.xml
index 06d3c30f..a9a948be 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TTrainMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TTrainMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TTrainMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TTrainMapper">
 
     <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TTrain" id="tTrainMap">
             <result property="id" column="id"/>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TTrainMaterialMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TTrainMaterialMapper.xml
index 128ec6aa..dc6baf18 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TTrainMaterialMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TTrainMaterialMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TTrainMaterialMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TTrainMaterialMapper">
 
     <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TTrainMaterial" id="tTrainMaterialMap">
             <result property="id" column="id"/>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TTrainRecordMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TTrainRecordMapper.xml
index 91368797..741a2942 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TTrainRecordMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TTrainRecordMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TTrainRecordMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TTrainRecordMapper">
 
     <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TTrainRecord" id="tTrainRecordMap">
             <result property="id" column="id"/>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TTrainReportMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TTrainReportMapper.xml
index 5fb19969..6f8e4e5c 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TTrainReportMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TTrainReportMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TTrainReportMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TTrainReportMapper">
 
     <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TTrainReport" id="tTrainReportMap">
         <result property="id" column="id"/>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TTrainTeacherMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TTrainTeacherMapper.xml
index 80cc3e65..9598e7f3 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TTrainTeacherMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TTrainTeacherMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TTrainTeacherMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TTrainTeacherMapper">
 
     <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TTrainTeacher" id="tTrainTeacherMap">
             <result property="teacherName" column="teacher_name"/>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TTrainUserMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TTrainUserMapper.xml
index 9b3c41d4..ceb38d8f 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TTrainUserMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TTrainUserMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TTrainUserMapper">
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TTrainUserMapper">
 
     <resultMap type="cn.iocoder.yudao.module.knowledge.entity.TTrainUser" id="tTrainUserMap">
         <result property="id" column="id"/>
diff --git a/dl-module-knowledge/src/main/resources/mapper/TViolationImageMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TViolationImageMapper.xml
index 117afa9f..af79b8b1 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TViolationImageMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TViolationImageMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TViolationImageMapper" >
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TViolationImageMapper" >
 
 
   <select id="selectByViolationId" resultType="cn.iocoder.yudao.module.knowledge.entity.TViolationImage">
diff --git a/dl-module-knowledge/src/main/resources/mapper/TViolationMapper.xml b/dl-module-knowledge/src/main/resources/mapper/TViolationMapper.xml
index 31ded9ae..0a904964 100644
--- a/dl-module-knowledge/src/main/resources/mapper/TViolationMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/TViolationMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.TViolationMapper" >
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.TViolationMapper" >
   <resultMap id="BaseResultMap" type="cn.iocoder.yudao.module.knowledge.entity.TViolation" >
     <id property="id" column="id" jdbcType="BIGINT" />
     <result property="title" column="filename" jdbcType="VARCHAR" />
@@ -10,7 +10,7 @@
     <result property="code" column="violation_code" jdbcType="VARCHAR" />
     <result property="violationTime" column="violation_time" jdbcType="TIMESTAMP" />
     <result property="lastPushTime" column="last_push_time" jdbcType="TIMESTAMP" />
-    <result property="violationA" column="violation_image_a" jdbcType="VARCHAR" />
+
     <result property="violationB" column="file_url" jdbcType="VARCHAR" />
   </resultMap>
 
diff --git a/dl-module-knowledge/src/main/resources/mapper/UserInfoMapper.xml b/dl-module-knowledge/src/main/resources/mapper/UserInfoMapper.xml
index ced276a9..ec16add2 100644
--- a/dl-module-knowledge/src/main/resources/mapper/UserInfoMapper.xml
+++ b/dl-module-knowledge/src/main/resources/mapper/UserInfoMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="cn.iocoder.yudao.module.knowledge.dao.UserInfoMapper" >
+<mapper namespace="cn.iocoder.yudao.module.knowledge.mapper.UserInfoMapper" >
   <resultMap id="BaseResultMap" type="cn.iocoder.yudao.module.knowledge.entity.UserInfo" >
     <id column="ID" property="id" jdbcType="DECIMAL" />
     <result column="USERNAME" property="username" jdbcType="VARCHAR" />
diff --git a/pom.xml b/pom.xml
index 0d2f935c..836e3d7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,6 +25,7 @@
         <module>dl-module-company</module>
         <!-- Server 主项目 -->
         <module>yudao-server</module>
+        <module>dl-module-knowledge</module>
 
         <!--        <module>yudao-module-ai</module>-->
     </modules>
diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/PageResult.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/PageResult.java
index ff9087a8..1f6809e6 100644
--- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/PageResult.java
+++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/PageResult.java
@@ -16,6 +16,17 @@ public final class PageResult<T> implements Serializable {
 
     @Schema(description = "总量", requiredMode = Schema.RequiredMode.REQUIRED)
     private Long total;
+    @Schema(
+            description = "当前页数据量",
+            requiredMode = Schema.RequiredMode.REQUIRED
+    )
+    private Integer currentSize;
+    @Schema(
+            description = "当前页数",
+            requiredMode = Schema.RequiredMode.REQUIRED
+    )
+    private Integer currentPage;
+
 
     public PageResult() {
     }
@@ -29,7 +40,12 @@ public final class PageResult<T> implements Serializable {
         this.list = new ArrayList<>();
         this.total = total;
     }
-
+    public PageResult(List<T> list, Long total, Integer currentSize, Integer currentPage) {
+        this.list = list;
+        this.total = total;
+        this.currentPage = currentSize;
+        this.currentSize = currentPage;
+    }
     public static <T> PageResult<T> empty() {
         return new PageResult<>(0L);
     }
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/chat/AiChatConversationController.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/chat/AiChatConversationController.java
index 5142cde4..bafc4c44 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/chat/AiChatConversationController.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/chat/AiChatConversationController.java
@@ -16,7 +16,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/chat/AiChatMessageController.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/chat/AiChatMessageController.java
index 357dbec5..5086e575 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/chat/AiChatMessageController.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/chat/AiChatMessageController.java
@@ -21,7 +21,7 @@ import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 import jakarta.annotation.security.PermitAll;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/chat/vo/conversation/AiChatConversationUpdateMyReqVO.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/chat/vo/conversation/AiChatConversationUpdateMyReqVO.java
index f9ce64ba..408e01bc 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/chat/vo/conversation/AiChatConversationUpdateMyReqVO.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/chat/vo/conversation/AiChatConversationUpdateMyReqVO.java
@@ -1,7 +1,7 @@
 package cn.iocoder.yudao.module.ai.controller.admin.chat.vo.conversation;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Schema(description = "管理后台 - AI 聊天对话更新【我的】 Request VO")
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/chat/vo/message/AiChatMessageSendReqVO.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/chat/vo/message/AiChatMessageSendReqVO.java
index 89a84bcb..06020dde 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/chat/vo/message/AiChatMessageSendReqVO.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/chat/vo/message/AiChatMessageSendReqVO.java
@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.ai.controller.admin.chat.vo.message;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
 import lombok.experimental.Accessors;
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/AiImageController.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/AiImageController.java
index de12ee1e..2c2d76c2 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/AiImageController.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/AiImageController.java
@@ -19,7 +19,7 @@ import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 import jakarta.annotation.security.PermitAll;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/AiImageDrawReqVO.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/AiImageDrawReqVO.java
index a38935ef..b78c53c7 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/AiImageDrawReqVO.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/AiImageDrawReqVO.java
@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.ai.controller.admin.image.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
 import org.springframework.ai.openai.OpenAiImageOptions;
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/AiImageUpdateReqVO.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/AiImageUpdateReqVO.java
index 45df0101..acc4ec41 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/AiImageUpdateReqVO.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/AiImageUpdateReqVO.java
@@ -1,7 +1,7 @@
 package cn.iocoder.yudao.module.ai.controller.admin.image.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Schema(description = "管理后台 - AI 绘画修改 Request VO")
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/midjourney/AiMidjourneyActionReqVO.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/midjourney/AiMidjourneyActionReqVO.java
index 28803a05..2da7355a 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/midjourney/AiMidjourneyActionReqVO.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/midjourney/AiMidjourneyActionReqVO.java
@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.ai.controller.admin.image.vo.midjourney;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Schema(description = "管理后台 - AI 绘图操作（Midjourney） Request VO")
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/midjourney/AiMidjourneyImagineReqVO.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/midjourney/AiMidjourneyImagineReqVO.java
index b9088263..b52fff87 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/midjourney/AiMidjourneyImagineReqVO.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/midjourney/AiMidjourneyImagineReqVO.java
@@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.ai.controller.admin.image.vo.midjourney;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Schema(description = "管理后台 - AI 绘画生成（Midjourney） Request VO")
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/mindmap/AiMindMapController.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/mindmap/AiMindMapController.java
index 01518026..3b58b0af 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/mindmap/AiMindMapController.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/mindmap/AiMindMapController.java
@@ -7,7 +7,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 import jakarta.annotation.security.PermitAll;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/mindmap/vo/AiMindMapGenerateReqVO.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/mindmap/vo/AiMindMapGenerateReqVO.java
index 08404bb0..e924033a 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/mindmap/vo/AiMindMapGenerateReqVO.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/mindmap/vo/AiMindMapGenerateReqVO.java
@@ -1,7 +1,7 @@
 package cn.iocoder.yudao.module.ai.controller.admin.mindmap.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
 import lombok.Data;
 
 @Schema(description = "管理后台 - AI 思维导图生成 Request VO")
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/AiApiKeyController.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/AiApiKeyController.java
index 2bc19005..0e617024 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/AiApiKeyController.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/AiApiKeyController.java
@@ -14,7 +14,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/AiChatModelController.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/AiChatModelController.java
index 08a53b28..fb15148b 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/AiChatModelController.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/AiChatModelController.java
@@ -12,7 +12,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/AiChatRoleController.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/AiChatRoleController.java
index 02f698b9..a76d3f56 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/AiChatRoleController.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/AiChatRoleController.java
@@ -14,7 +14,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/music/AiMusicController.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/music/AiMusicController.java
index 6c09e4b3..32a1774a 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/music/AiMusicController.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/music/AiMusicController.java
@@ -11,7 +11,7 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/music/vo/AiMusicUpdateMyReqVO.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/music/vo/AiMusicUpdateMyReqVO.java
index 45767011..00589c91 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/music/vo/AiMusicUpdateMyReqVO.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/music/vo/AiMusicUpdateMyReqVO.java
@@ -1,7 +1,7 @@
 package cn.iocoder.yudao.module.ai.controller.admin.music.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Schema(description = "管理后台 - AI 修改我的音乐 Request VO")
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/music/vo/AiMusicUpdateReqVO.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/music/vo/AiMusicUpdateReqVO.java
index 447bc976..2eab0e05 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/music/vo/AiMusicUpdateReqVO.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/music/vo/AiMusicUpdateReqVO.java
@@ -1,7 +1,7 @@
 package cn.iocoder.yudao.module.ai.controller.admin.music.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Schema(description = "管理后台 - AI 音乐修改 Request VO")
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/music/vo/AiSunoGenerateReqVO.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/music/vo/AiSunoGenerateReqVO.java
index f72d2b54..437c79de 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/music/vo/AiSunoGenerateReqVO.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/music/vo/AiSunoGenerateReqVO.java
@@ -1,9 +1,9 @@
 package cn.iocoder.yudao.module.ai.controller.admin.music.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotEmpty;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 import java.util.List;
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/write/AiWriteController.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/write/AiWriteController.java
index d27204d2..c42a285d 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/write/AiWriteController.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/write/AiWriteController.java
@@ -13,7 +13,7 @@ import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
 import jakarta.annotation.security.PermitAll;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/write/vo/AiWriteGenerateReqVO.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/write/vo/AiWriteGenerateReqVO.java
index 21c60420..6d077d06 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/write/vo/AiWriteGenerateReqVO.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/write/vo/AiWriteGenerateReqVO.java
@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.ai.controller.admin.write.vo;
 import cn.iocoder.yudao.framework.common.validation.InEnum;
 import cn.iocoder.yudao.module.ai.enums.write.AiWriteTypeEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 @Schema(description = "管理后台 - AI 写作生成 Request VO")
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/image/AiImageService.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/image/AiImageService.java
index 716c7ea8..0908018e 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/image/AiImageService.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/image/AiImageService.java
@@ -9,7 +9,7 @@ import cn.iocoder.yudao.module.ai.controller.admin.image.vo.AiImageUpdateReqVO;
 import cn.iocoder.yudao.module.ai.controller.admin.image.vo.midjourney.AiMidjourneyActionReqVO;
 import cn.iocoder.yudao.module.ai.controller.admin.image.vo.midjourney.AiMidjourneyImagineReqVO;
 import cn.iocoder.yudao.module.ai.dal.dataobject.image.AiImageDO;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 
 import java.util.List;
 
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiApiKeyService.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiApiKeyService.java
index fe8fdd19..ff4afa54 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiApiKeyService.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiApiKeyService.java
@@ -7,7 +7,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.ai.controller.admin.model.vo.apikey.AiApiKeyPageReqVO;
 import cn.iocoder.yudao.module.ai.controller.admin.model.vo.apikey.AiApiKeySaveReqVO;
 import cn.iocoder.yudao.module.ai.dal.dataobject.model.AiApiKeyDO;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 import org.springframework.ai.chat.model.ChatModel;
 import org.springframework.ai.image.ImageModel;
 
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiChatModelService.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiChatModelService.java
index f83ac73c..111e4267 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiChatModelService.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiChatModelService.java
@@ -4,7 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.ai.controller.admin.model.vo.chatModel.AiChatModelPageReqVO;
 import cn.iocoder.yudao.module.ai.controller.admin.model.vo.chatModel.AiChatModelSaveReqVO;
 import cn.iocoder.yudao.module.ai.dal.dataobject.model.AiChatModelDO;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiChatRoleService.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiChatRoleService.java
index 81c8d259..147e362c 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiChatRoleService.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/model/AiChatRoleService.java
@@ -5,7 +5,7 @@ import cn.iocoder.yudao.module.ai.controller.admin.model.vo.chatRole.AiChatRoleP
 import cn.iocoder.yudao.module.ai.controller.admin.model.vo.chatRole.AiChatRoleSaveMyReqVO;
 import cn.iocoder.yudao.module.ai.controller.admin.model.vo.chatRole.AiChatRoleSaveReqVO;
 import cn.iocoder.yudao.module.ai.dal.dataobject.model.AiChatRoleDO;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/music/AiMusicService.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/music/AiMusicService.java
index 49f8332d..a4b117bd 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/music/AiMusicService.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/music/AiMusicService.java
@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.ai.service.music;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.ai.controller.admin.music.vo.*;
 import cn.iocoder.yudao.module.ai.dal.dataobject.music.AiMusicDO;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
 
 import java.util.List;
 
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java
index 8b2ce4fa..9125b5d9 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java
@@ -46,6 +46,20 @@ public class FileController {
         return success(fileService.createFile(file.getOriginalFilename(), path, IoUtil.readBytes(file.getInputStream())));
     }
 
+    /**
+     * 返回详细版
+     * @param uploadReqVO
+     * @return
+     * @throws Exception
+     */
+    @PostMapping("/uploadDetail")
+    @Operation(summary = "上传文件", description = "模式一：后端上传文件")
+    public CommonResult<FileDO> uploadDetail(FileUploadReqVO uploadReqVO) throws Exception {
+        MultipartFile file = uploadReqVO.getFile();
+        String path = uploadReqVO.getPath();
+        return success(fileService.createFileDetail(file.getOriginalFilename(), path, IoUtil.readBytes(file.getInputStream())));
+    }
+
     @GetMapping("/presigned-url")
     @Operation(summary = "获取文件预签名地址", description = "模式二：前端上传文件：用于前端直接上传七牛、阿里云 OSS 等文件存储器")
     public CommonResult<FilePresignedUrlRespVO> getFilePresignedUrl(@RequestParam("path") String path) throws Exception {
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileService.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileService.java
index 3ca9a241..cf40e74e 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileService.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileService.java
@@ -30,7 +30,7 @@ public interface FileService {
      * @return 文件路径
      */
     String createFile(String name, String path, byte[] content);
-
+    FileDO createFileDetail(String name, String path, byte[] content);
     /**
      * 创建文件
      *
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java
index 8efa5fe6..85aa8121 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java
@@ -70,6 +70,37 @@ public class FileServiceImpl implements FileService {
         return url;
     }
 
+    @Override
+    @SneakyThrows
+    public FileDO createFileDetail(String name, String path, byte[] content) {
+        // 计算默认的 path 名
+        String type = FileTypeUtils.getMineType(content, name);
+        if (StrUtil.isEmpty(path)) {
+            path = FileUtils.generatePath(content, name);
+        }
+        // 如果 name 为空，则使用 path 填充
+        if (StrUtil.isEmpty(name)) {
+            name = path;
+        }
+
+        // 上传到文件存储器
+        FileClient client = fileConfigService.getMasterFileClient();
+        Assert.notNull(client, "客户端(master) 不能为空");
+        String url = client.upload(content, path, type);
+
+        // 保存到数据库
+        FileDO file = new FileDO();
+        file.setConfigId(client.getId());
+        file.setName(name);
+        file.setPath(path);
+        file.setUrl(url);
+        file.setType(type);
+        file.setSize(content.length);
+        fileMapper.insert(file);
+        return file;
+    }
+
+
     @Override
     public Long createFile(FileCreateReqVO createReqVO) {
         FileDO file = BeanUtils.toBean(createReqVO, FileDO.class);
diff --git a/yudao-server/pom.xml b/yudao-server/pom.xml
index e2cf2bbc..8a937e53 100644
--- a/yudao-server/pom.xml
+++ b/yudao-server/pom.xml
@@ -43,6 +43,12 @@
             <artifactId>dl-module-company</artifactId>
             <version>${revision}</version>
         </dependency>
+        <!-- 知识库包 -->
+        <dependency>
+            <groupId>cn.iocoder.boot</groupId>
+            <artifactId>dl-module-knowledge</artifactId>
+            <version>${revision}</version>
+        </dependency>
         <!-- 会员中心。默认注释，保证编译速度 -->
 <!--        <dependency>-->
 <!--            <groupId>cn.iocoder.boot</groupId>-->
diff --git a/yudao-server/src/main/resources/application.yaml b/yudao-server/src/main/resources/application.yaml
index ce4b11e3..c2c46353 100644
--- a/yudao-server/src/main/resources/application.yaml
+++ b/yudao-server/src/main/resources/application.yaml
@@ -84,6 +84,7 @@ mybatis-plus:
   mapper-locations:
     - classpath*:mapper/*/*.xml # 扫描子模块下的 mapper.xml文件
     - classpath:mapper/*/*.xml # 扫描当前模块下的 mapper.xml 文件
+    - classpath*:mapper/*.xml
   encryptor:
     password: XDV71a+xqStEA3WH # 加解密的秘钥，可使用 https://www.imaegoo.com/2020/aes-key-generator/ 网站生成