diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeService.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeService.java
index e3e4afb7..0f7b1b51 100644
--- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeService.java
+++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeService.java
@@ -230,7 +230,7 @@ public class NoticeService {
                     noticeVisibleRange.setDataName(employeeEntity == null ? StringConst.EMPTY : employeeEntity.getActualName());
                 } else {
                     DepartmentVO departmentVO = departmentService.getDepartmentById(noticeVisibleRange.getDataId());
-                    noticeVisibleRange.setDataName(departmentVO == null ? StringConst.EMPTY : departmentVO.getName());
+                    noticeVisibleRange.setDataName(departmentVO == null ? StringConst.EMPTY : departmentVO.getDepartmentName());
                 }
             }
             updateFormVO.setVisibleRangeList(noticeVisibleRangeList);
diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/entity/DepartmentEntity.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/entity/DepartmentEntity.java
index a76ea7e9..4d52bb16 100644
--- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/entity/DepartmentEntity.java
+++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/entity/DepartmentEntity.java
@@ -31,7 +31,7 @@ public class DepartmentEntity {
     /**
      * 部门名称
      */
-    private String name;
+    private String departmentName;
 
     /**
      * 负责人员工 id
diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/form/DepartmentAddForm.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/form/DepartmentAddForm.java
index f7f92c27..1cba929a 100644
--- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/form/DepartmentAddForm.java
+++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/form/DepartmentAddForm.java
@@ -20,7 +20,7 @@ public class DepartmentAddForm {
     @Schema(description = "部门名称")
     @Length(min = 1, max = 50, message = "请输入正确的部门名称(1-50个字符)")
     @NotNull(message = "请输入正确的部门名称(1-50个字符)")
-    private String name;
+    private String departmentName;
 
     @Schema(description = "排序")
     @NotNull(message = "排序值")
diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/vo/DepartmentVO.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/vo/DepartmentVO.java
index c973a959..43b2a355 100644
--- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/vo/DepartmentVO.java
+++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/vo/DepartmentVO.java
@@ -24,7 +24,7 @@ public class DepartmentVO implements Serializable {
     private Long departmentId;
 
     @Schema(description = "部门名称")
-    private String name;
+    private String departmentName;
 
     @Schema(description = "部门负责人姓名")
     private String managerName;
diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/manager/DepartmentCacheManager.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/manager/DepartmentCacheManager.java
index d829d355..810d2ffe 100644
--- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/manager/DepartmentCacheManager.java
+++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/manager/DepartmentCacheManager.java
@@ -97,15 +97,15 @@ public class DepartmentCacheManager {
      */
     private String buildDepartmentPath(DepartmentVO departmentVO, Map<Long, DepartmentVO> departmentMap) {
         if (Objects.equals(departmentVO.getParentId(), NumberUtils.LONG_ZERO)) {
-            return departmentVO.getName();
+            return departmentVO.getDepartmentName();
         }
         //父节点
         DepartmentVO parentDepartment = departmentMap.get(departmentVO.getParentId());
         if (parentDepartment == null) {
-            return departmentVO.getName();
+            return departmentVO.getDepartmentName();
         }
         String pathName = buildDepartmentPath(parentDepartment, departmentMap);
-        return pathName + "/" + departmentVO.getName();
+        return pathName + "/" + departmentVO.getDepartmentName();
 
     }
     // ---------------------- 构造树的一些方法 ------------------------------
diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/service/DepartmentService.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/service/DepartmentService.java
index 3c38e705..9ef2fbfc 100644
--- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/service/DepartmentService.java
+++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/service/DepartmentService.java
@@ -14,10 +14,7 @@ import net.lab1024.sa.base.common.domain.ResponseDTO;
 import net.lab1024.sa.base.common.util.SmartBeanUtil;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 部门 service
diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java
index 69e79891..65352b58 100644
--- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java
+++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java
@@ -242,8 +242,6 @@ public class EmployeeService {
     /**
      * 更新登录人头像
      *
-     * @param employeeUpdateAvatarForm
-     * @return
      */
     public ResponseDTO<String> updateAvatar(EmployeeUpdateAvatarForm employeeUpdateAvatarForm) {
         Long employeeId = employeeUpdateAvatarForm.getEmployeeId();
@@ -395,7 +393,7 @@ public class EmployeeService {
         List<EmployeeVO> voList = employeeEntityList.stream().map(e -> {
             EmployeeVO employeeVO = SmartBeanUtil.copy(e, EmployeeVO.class);
             if (department != null) {
-                employeeVO.setDepartmentName(department.getName());
+                employeeVO.setDepartmentName(department.getDepartmentName());
             }
             return employeeVO;
         }).collect(Collectors.toList());
diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/RequestEmployee.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/RequestEmployee.java
index 0b61e3d2..783ae444 100644
--- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/RequestEmployee.java
+++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/domain/RequestEmployee.java
@@ -7,6 +7,8 @@ import net.lab1024.sa.base.common.enumeration.GenderEnum;
 import net.lab1024.sa.base.common.enumeration.UserTypeEnum;
 import net.lab1024.sa.base.common.swagger.SchemaEnum;
 
+import java.io.Serializable;
+
 /**
  * 请求员工登录信息
  *
@@ -17,7 +19,7 @@ import net.lab1024.sa.base.common.swagger.SchemaEnum;
  * @Copyright  <a href="https://1024lab.net">1024创新实验室</a>
  */
 @Data
-public class RequestEmployee implements RequestUser {
+public class RequestEmployee implements RequestUser, Serializable {
 
     @Schema(description = "员工id")
     private Long employeeId;
diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/manager/LoginManager.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/manager/LoginManager.java
index 8fdc9a1d..434e4eca 100644
--- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/manager/LoginManager.java
+++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/manager/LoginManager.java
@@ -88,7 +88,7 @@ public class LoginManager {
 
         // 部门信息
         DepartmentVO department = departmentService.getDepartmentById(employeeEntity.getDepartmentId());
-        requestEmployee.setDepartmentName(null == department ? StringConst.EMPTY : department.getName());
+        requestEmployee.setDepartmentName(null == department ? StringConst.EMPTY : department.getDepartmentName());
 
         // 头像信息
         String avatar = employeeEntity.getAvatar();
diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuService.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuService.java
index 290e4f3f..53515aef 100644
--- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuService.java
+++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuService.java
@@ -15,6 +15,7 @@ import net.lab1024.sa.base.common.code.SystemErrorCode;
 import net.lab1024.sa.base.common.domain.RequestUrlVO;
 import net.lab1024.sa.base.common.domain.ResponseDTO;
 import net.lab1024.sa.base.common.util.SmartBeanUtil;
+import net.lab1024.sa.base.common.util.SmartStringUtil;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -134,6 +135,10 @@ public class MenuService {
      * @return true 重复 false 未重复
      */
     public <T extends MenuBaseForm> Boolean validateWebPerms(T menuDTO) {
+        if(SmartStringUtil.isEmpty(menuDTO.getWebPerms())){
+            return false;
+        }
+
         MenuEntity menu = menuDao.getByWebPerms(menuDTO.getWebPerms(), Boolean.FALSE);
         if (menuDTO instanceof MenuAddForm) {
             return menu != null;
diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleEmployeeUpdateForm.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleEmployeeUpdateForm.java
index 28775702..d4d2dc4f 100644
--- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleEmployeeUpdateForm.java
+++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/domain/form/RoleEmployeeUpdateForm.java
@@ -5,7 +5,6 @@ import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
-import java.util.List;
 import java.util.Set;
 
 /**
diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleEmployeeService.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleEmployeeService.java
index d77f364f..05481c03 100644
--- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleEmployeeService.java
+++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleEmployeeService.java
@@ -73,7 +73,7 @@ public class RoleEmployeeService {
         List<Long> departmentIdList = employeeList.stream().filter(e -> e != null && e.getDepartmentId() != null).map(EmployeeVO::getDepartmentId).collect(Collectors.toList());
         if (CollectionUtils.isNotEmpty(departmentIdList)) {
             List<DepartmentEntity> departmentEntities = departmentDao.selectBatchIds(departmentIdList);
-            Map<Long, String> departmentIdNameMap = departmentEntities.stream().collect(Collectors.toMap(DepartmentEntity::getDepartmentId, DepartmentEntity::getName));
+            Map<Long, String> departmentIdNameMap = departmentEntities.stream().collect(Collectors.toMap(DepartmentEntity::getDepartmentId, DepartmentEntity::getDepartmentName));
             employeeList.forEach(e -> {
                 e.setDepartmentName(departmentIdNameMap.getOrDefault(e.getDepartmentId(), StringConst.EMPTY));
             });
diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminProtectController.java b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminProtectController.java
index 69f7e3fa..49780a34 100644
--- a/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminProtectController.java
+++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminProtectController.java
@@ -22,7 +22,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- *
  * 网络安全
  *
  * @Author 1024创新实验室-主任:卓大
diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/business/oa/enterprise/EnterpriseEmployeeMapper.xml b/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/business/oa/enterprise/EnterpriseEmployeeMapper.xml
index 62acf08f..ba1a417f 100644
--- a/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/business/oa/enterprise/EnterpriseEmployeeMapper.xml
+++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/business/oa/enterprise/EnterpriseEmployeeMapper.xml
@@ -70,7 +70,7 @@
     <select id="queryPageEmployeeList"
             resultType="net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseEmployeeVO">
         select
-        t_oa_enterprise_employee.*,
+        t_oa_enterprise_employee.enterprise_id,
         t_oa_enterprise.enterprise_name,
         t_employee.*,
         t_employee.actual_name as employeeName
diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/business/oa/notice/NoticeMapper.xml b/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/business/oa/notice/NoticeMapper.xml
index 9b141c80..6b8080b1 100644
--- a/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/business/oa/notice/NoticeMapper.xml
+++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/business/oa/notice/NoticeMapper.xml
@@ -219,7 +219,7 @@
     <select id="queryNoticeViewRecordList" resultType="net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeViewRecordVO">
         select t_notice_view_record.*,
         t_employee.actual_name as employeeName,
-        t_department.name as departmentName
+        t_department.department_name
         from t_notice_view_record
         left join t_employee on t_employee.employee_id = t_notice_view_record.employee_id
         left join t_department on t_department.department_id = t_employee.department_id
diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/system/department/DepartmentMapper.xml b/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/system/department/DepartmentMapper.xml
index 8ee2974d..939008a3 100644
--- a/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/system/department/DepartmentMapper.xml
+++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/system/department/DepartmentMapper.xml
@@ -6,7 +6,7 @@
     <select id="listAll" resultType="net.lab1024.sa.admin.module.system.department.domain.vo.DepartmentVO">
         SELECT t_department.*,
                t_employee.actual_name   as managerName,
-               parent_department.`name` as parentName
+               parent_department.department_name   as parentName
         FROM t_department
                  left join t_employee on t_department.manager_id = t_employee.employee_id
                  left join t_department parent_department on t_department.parent_id = parent_department.department_id
@@ -23,7 +23,7 @@
             resultType="net.lab1024.sa.admin.module.system.department.domain.vo.DepartmentVO">
         SELECT t_department.*,
                t_employee.actual_name   as managerName,
-               parent_department.`name` as parentName
+               parent_department.department_name   as parentName
         FROM t_department
                  left join t_employee on t_department.manager_id = t_employee.employee_id
                  left join t_department parent_department on t_department.parent_id = parent_department.department_id
diff --git a/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/system/employee/EmployeeMapper.xml b/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/system/employee/EmployeeMapper.xml
index 670d52ed..236a4e4b 100644
--- a/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/system/employee/EmployeeMapper.xml
+++ b/smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/system/employee/EmployeeMapper.xml
@@ -5,7 +5,7 @@
     <select id="queryEmployee" resultType="net.lab1024.sa.admin.module.system.employee.domain.vo.EmployeeVO">
         SELECT
         t_employee.*,
-        t_department.name AS departmentName
+        t_department.department_name
         FROM t_employee
         LEFT JOIN t_department ON t_department.department_id = t_employee.department_id
         <where>
@@ -169,7 +169,7 @@
 
     <select id="getEmployeeById" resultType="net.lab1024.sa.admin.module.system.employee.domain.vo.EmployeeVO">
         SELECT t_employee.*,
-               t_department.name AS departmentName
+               t_department.department_name
         FROM t_employee
                  LEFT JOIN t_department ON t_department.department_id = t_employee.department_id
         where t_employee.employee_id = #{employeeId}
@@ -178,7 +178,7 @@
     <select id="selectEmployeeByDisabledAndDeleted" resultType="net.lab1024.sa.admin.module.system.employee.domain.vo.EmployeeVO">
         SELECT
         t_employee.*,
-        t_department.name AS departmentName
+        t_department.department_name
         FROM t_employee
         LEFT JOIN t_department ON t_department.department_id = t_employee.department_id
         <where>
diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/common/controller/SupportBaseController.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/common/controller/SupportBaseController.java
index 4449af25..6f0a28d5 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/common/controller/SupportBaseController.java
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/common/controller/SupportBaseController.java
@@ -3,6 +3,7 @@ package net.lab1024.sa.base.common.controller;
 import net.lab1024.sa.base.constant.SwaggerTagConst;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+
 /**
  * 支撑类业务路由基类
  *
diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/CacheConfig.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/CacheConfig.java
index 356b082c..c1440361 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/CacheConfig.java
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/config/CacheConfig.java
@@ -28,7 +28,8 @@ public class CacheConfig {
         return RedisCacheConfiguration.defaultCacheConfig()
                 .disableCachingNullValues()
                 .computePrefixWith(name -> "cache:" + name + ":")
-                .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(new GenericFastJsonRedisSerializer()));
+//                .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(new GenericFastJsonRedisSerializer()));
+        ;
     }
 
     @Bean
diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/entity/ChangeLogEntity.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/entity/ChangeLogEntity.java
index d0bf74b9..3361a8de 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/entity/ChangeLogEntity.java
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/entity/ChangeLogEntity.java
@@ -28,7 +28,7 @@ public class ChangeLogEntity {
     /**
      * 版本
      */
-    private String version;
+    private String updateVersion;
 
     /**
      * 更新类型:[1:特大版本功能更新;2:功能更新;3:bug修复]
diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/form/ChangeLogAddForm.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/form/ChangeLogAddForm.java
index 22979b2f..f1971462 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/form/ChangeLogAddForm.java
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/form/ChangeLogAddForm.java
@@ -23,7 +23,7 @@ public class ChangeLogAddForm {
 
     @Schema(description = "版本", required = true)
     @NotBlank(message = "版本 不能为空")
-    private String version;
+    private String updateVersion;
 
     @SchemaEnum(value = ChangeLogTypeEnum.class, desc = "更新类型:[1:特大版本功能更新;2:功能更新;3:bug修复]")
     @CheckEnum(value = ChangeLogTypeEnum.class, message = "更新类型:[1:特大版本功能更新;2:功能更新;3:bug修复] 错误", required = true)
diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/form/ChangeLogUpdateForm.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/form/ChangeLogUpdateForm.java
index a907a234..eaa5414d 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/form/ChangeLogUpdateForm.java
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/form/ChangeLogUpdateForm.java
@@ -27,7 +27,7 @@ public class ChangeLogUpdateForm {
 
     @Schema(description = "版本", required = true)
     @NotBlank(message = "版本 不能为空")
-    private String version;
+    private String updateVersion;
 
     @SchemaEnum(value = ChangeLogTypeEnum.class, desc = "更新类型:[1:特大版本功能更新;2:功能更新;3:bug修复]")
     @CheckEnum(value = ChangeLogTypeEnum.class, message = "更新类型:[1:特大版本功能更新;2:功能更新;3:bug修复] 错误", required = true)
diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/vo/ChangeLogVO.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/vo/ChangeLogVO.java
index e8930d0f..10270f42 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/vo/ChangeLogVO.java
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/vo/ChangeLogVO.java
@@ -23,7 +23,7 @@ public class ChangeLogVO {
     private Long changeLogId;
 
     @Schema(description = "版本")
-    private String version;
+    private String updateVersion;
 
     @SchemaEnum(value = ChangeLogTypeEnum.class, desc = "更新类型:[1:特大版本功能更新;2:功能更新;3:bug修复]")
     private Integer type;
diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/service/ChangeLogService.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/service/ChangeLogService.java
index b8d2047b..61e0971b 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/service/ChangeLogService.java
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/service/ChangeLogService.java
@@ -44,7 +44,7 @@ public class ChangeLogService {
      * 添加
      */
     public synchronized ResponseDTO<String> add(ChangeLogAddForm addForm) {
-        ChangeLogEntity existVersion = changeLogDao.selectByVersion(addForm.getVersion());
+        ChangeLogEntity existVersion = changeLogDao.selectByVersion(addForm.getUpdateVersion());
         if (existVersion != null) {
             return ResponseDTO.userErrorParam("此版本已经存在");
         }
@@ -58,7 +58,7 @@ public class ChangeLogService {
      * 更新
      */
     public synchronized ResponseDTO<String> update(ChangeLogUpdateForm updateForm) {
-        ChangeLogEntity existVersion = changeLogDao.selectByVersion(updateForm.getVersion());
+        ChangeLogEntity existVersion = changeLogDao.selectByVersion(updateForm.getUpdateVersion());
         if (existVersion != null && !updateForm.getChangeLogId().equals(existVersion.getChangeLogId())) {
             return ResponseDTO.userErrorParam("此版本已经存在");
         }
diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/constant/CodeGeneratorConstant.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/constant/CodeGeneratorConstant.java
index 1b2fe58c..c0f436dd 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/constant/CodeGeneratorConstant.java
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/constant/CodeGeneratorConstant.java
@@ -11,16 +11,6 @@ package net.lab1024.sa.base.module.support.codegenerator.constant;
  */
 public class CodeGeneratorConstant {
 
-    /**
-     * 主键
-     */
-    public final static String PRIMARY_KEY = "PRI";
-
-    /**
-     * 自增
-     */
-    public final static String AUTO_INCREMENT = "auto_increment";
-
     /**
      * 默认逻辑删除字段名称
      */
diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/vo/TableColumnVO.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/vo/TableColumnVO.java
index b28c39ec..0fa76e5c 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/vo/TableColumnVO.java
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/vo/TableColumnVO.java
@@ -23,20 +23,26 @@ public class TableColumnVO {
     @Schema(description = "列描述")
     private String columnComment;
 
-    @Schema(description = "columnKey")
-    private String columnKey;
-
-    @Schema(description = "extra")
-    private String extra;
-
-    @Schema(description = "是否为空")
-    private String isNullable;
-
     @Schema(description = "数据类型varchar")
     private String dataType;
 
-    @Schema(description = "列类型varchar(50)")
-    private String columnType;
+    @Schema(description = "是否为空")
+    private Boolean nullableFlag;
 
+    @Schema(description = "是否为主键")
+    private Boolean primaryKeyFlag;
 
+    @Schema(description = "是否递增")
+    private Boolean autoIncreaseFlag;
+
+    // --------------- 临时字段 -------------------
+
+    @Schema(hidden = true)
+    private String columnKey;
+
+    @Schema(hidden = true)
+    private String extra;
+
+    @Schema(hidden = true)
+    private String isNullable;
 }
diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/service/DataTracerChangeContentService.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/service/DataTracerChangeContentService.java
index e872c7be..213553a8 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/service/DataTracerChangeContentService.java
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/service/DataTracerChangeContentService.java
@@ -160,6 +160,16 @@ public class DataTracerChangeContentService {
         return "【原数据】:<br/>" + oldContent + "<br/>" + "【新数据】:<br/>" + newContent;
     }
 
+    /**
+     * 解析批量bean的内容
+     *
+     * @param objectList 对象列表
+     * @return 单个内容
+     */
+    public  <T> String  getChangeContent(List<T> objectList) {
+        return this.getObjectListContent(objectList);
+    }
+
     /**
      * 获取一个对象的内容信息
      *
diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/entity/HelpDocCatalogEntity.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/entity/HelpDocCatalogEntity.java
index 3b6a2ccf..bf36ccb8 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/entity/HelpDocCatalogEntity.java
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/entity/HelpDocCatalogEntity.java
@@ -43,7 +43,6 @@ public class HelpDocCatalogEntity {
     /**
      * 排序
      */
-    @TableField("`sort`")
     private Integer sort;
 
 
diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/entity/HelpDocEntity.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/entity/HelpDocEntity.java
index 6dd02387..b19542c3 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/entity/HelpDocEntity.java
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/entity/HelpDocEntity.java
@@ -53,7 +53,6 @@ public class HelpDocEntity {
     /**
      * 排序
      */
-    @TableField("`sort`")
     private Integer sort;
 
     /**
diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/mail/MailService.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/mail/MailService.java
index d000d243..18fac72a 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/mail/MailService.java
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/mail/MailService.java
@@ -47,7 +47,7 @@ import java.util.Map;
 @Component
 public class MailService {
 
-    @Autowired
+    @Resource
     private JavaMailSender javaMailSender;
 
     @Resource
diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/Level3ProtectConfigService.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/Level3ProtectConfigService.java
index 00cb51ed..ccbfef54 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/Level3ProtectConfigService.java
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/Level3ProtectConfigService.java
@@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import jakarta.annotation.PostConstruct;
 import jakarta.annotation.Resource;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.lab1024.sa.base.common.domain.ResponseDTO;
 import net.lab1024.sa.base.module.support.config.ConfigKeyEnum;
@@ -28,17 +29,29 @@ public class Level3ProtectConfigService {
 
     /**
      * 开启双因子登录，默认：开启
+     * -- GETTER --
+     *  开启双因子登录，默认：开启
+
      */
+    @Getter
     private boolean twoFactorLoginEnabled = false;
 
     /**
      * 连续登录失败次数则锁定，-1表示不受限制，可以一直尝试登录
+     * -- GETTER --
+     *  连续登录失败次数则锁定，-1表示不受限制，可以一直尝试登录
+
      */
+    @Getter
     private int loginFailMaxTimes = -1;
 
     /**
      * 连续登录失败锁定时间（单位：秒），-1表示不锁定，建议锁定30分钟
+     * -- GETTER --
+     *  连续登录失败锁定时间（单位：秒），-1表示不锁定，建议锁定30分钟
+
      */
+    @Getter
     private int loginFailLockSeconds = 1800;
 
     /**
@@ -48,61 +61,53 @@ public class Level3ProtectConfigService {
 
     /**
      * 密码复杂度 是否开启，默认：开启
+     * -- GETTER --
+     *  密码复杂度 是否开启，默认：开启
+
      */
+    @Getter
     private boolean passwordComplexityEnabled = true;
 
     /**
      * 定期修改密码时间间隔（默认：天），默认：建议90天更换密码
+     * -- GETTER --
+     *  定期修改密码时间间隔（默认：天），默认：建议90天更换密码
+
      */
+    @Getter
     private int regularChangePasswordDays = 90;
 
     /**
      * 定期修改密码不允许相同次数，默认：3次以内密码不能相同
+     * -- GETTER --
+     *  定期修改密码不允许相同次数，默认：3次以内密码不能相同
+
      */
+    @Getter
     private int regularChangePasswordNotAllowRepeatTimes = 3;
 
     /**
      * 文件大小限制，单位 mb ，(默认：50 mb)
+     * -- GETTER --
+     *  文件大小限制，单位 mb ，(默认：50 mb)
+
      */
+    @Getter
     private long maxUploadFileSizeMb = 50;
 
     /**
      * 文件检测，默认：不开启
+     * -- GETTER --
+     *  文件检测，默认：不开启
+
      */
+    @Getter
     private boolean fileDetectFlag = false;
 
 
     @Resource
     private ConfigService configService;
 
-    /**
-     * 文件检测，默认：不开启
-     */
-    public boolean isFileDetectFlag() {
-        return fileDetectFlag;
-    }
-
-    /**
-     * 文件大小限制，单位 mb ，(默认：50 mb)
-     */
-    public long getMaxUploadFileSizeMb() {
-        return maxUploadFileSizeMb;
-    }
-
-    /**
-     * 连续登录失败次数则锁定，-1表示不受限制，可以一直尝试登录
-     */
-    public int getLoginFailMaxTimes() {
-        return loginFailMaxTimes;
-    }
-
-    /**
-     * 连续登录失败锁定时间（单位：秒），-1表示不锁定，建议锁定30分钟
-     */
-    public int getLoginFailLockSeconds() {
-        return loginFailLockSeconds;
-    }
-
     /**
      * 最低活跃时间（单位：秒），超过此时间没有操作系统就会被冻结，默认-1 代表不限制，永不冻结; 默认 30分钟
      */
@@ -110,34 +115,6 @@ public class Level3ProtectConfigService {
         return loginActiveTimeoutSeconds > 0 ? loginActiveTimeoutSeconds : -1;
     }
 
-    /**
-     * 定期修改密码时间间隔（默认：天），默认：建议90天更换密码
-     */
-    public int getRegularChangePasswordDays() {
-        return regularChangePasswordDays;
-    }
-
-    /**
-     * 开启双因子登录，默认：开启
-     */
-    public boolean isTwoFactorLoginEnabled() {
-        return twoFactorLoginEnabled;
-    }
-
-    /**
-     * 密码复杂度 是否开启，默认：开启
-     */
-    public boolean isPasswordComplexityEnabled() {
-        return passwordComplexityEnabled;
-    }
-
-    /**
-     * 定期修改密码不允许相同次数，默认：3次以内密码不能相同
-     */
-    public int getRegularChangePasswordNotAllowRepeatTimes() {
-        return regularChangePasswordNotAllowRepeatTimes;
-    }
-
     @PostConstruct
     void init() {
         String configValue = configService.getConfigValue(ConfigKeyEnum.LEVEL3_PROTECT_CONFIG);
diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/SecurityPasswordService.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/SecurityPasswordService.java
index 3cd83058..5ae0a3ad 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/SecurityPasswordService.java
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/SecurityPasswordService.java
@@ -6,7 +6,6 @@ import net.lab1024.sa.base.common.domain.ResponseDTO;
 import net.lab1024.sa.base.common.util.SmartStringUtil;
 import net.lab1024.sa.base.module.support.securityprotect.dao.PasswordLogDao;
 import net.lab1024.sa.base.module.support.securityprotect.domain.PasswordLogEntity;
-import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.springframework.security.crypto.argon2.Argon2PasswordEncoder;
 import org.springframework.stereotype.Service;
diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/SerialNumberBaseService.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/SerialNumberBaseService.java
index baa912b4..fce5e110 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/SerialNumberBaseService.java
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/SerialNumberBaseService.java
@@ -11,6 +11,8 @@ import net.lab1024.sa.base.module.support.serialnumber.dao.SerialNumberDao;
 import net.lab1024.sa.base.module.support.serialnumber.dao.SerialNumberRecordDao;
 import net.lab1024.sa.base.module.support.serialnumber.domain.*;
 import org.apache.commons.lang3.RandomUtils;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -92,6 +94,7 @@ public abstract class SerialNumberBaseService implements SerialNumberService {
     public abstract void initLastGenerateData(List<SerialNumberEntity> serialNumberEntityList);
 
     @Override
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
     public String generate(SerialNumberIdEnum serialNumberIdEnum) {
         List<String> generateList = this.generate(serialNumberIdEnum, 1);
         if (generateList == null || generateList.isEmpty()) {
@@ -101,6 +104,7 @@ public abstract class SerialNumberBaseService implements SerialNumberService {
     }
 
     @Override
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
     public List<String> generate(SerialNumberIdEnum serialNumberIdEnum, int count) {
         SerialNumberInfoBO serialNumberInfoBO = serialNumberMap.get(serialNumberIdEnum.getSerialNumberId());
         if (serialNumberInfoBO == null) {
diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/impl/SerialNumberRedisService.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/impl/SerialNumberRedisService.java
index 571e0d94..b70f8b24 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/impl/SerialNumberRedisService.java
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/impl/SerialNumberRedisService.java
@@ -60,22 +60,24 @@ public class SerialNumberRedisService extends SerialNumberBaseService {
     public List<String> generateSerialNumberList(SerialNumberInfoBO serialNumberInfo, int count) {
         SerialNumberGenerateResultBO serialNumberGenerateResult = null;
         String lockKey = RedisKeyConst.Support.SERIAL_NUMBER + serialNumberInfo.getSerialNumberId();
-        try {
-            boolean lock = false;
-            for (int i = 0; i < MAX_GET_LOCK_COUNT; i++) {
-                try {
-                    lock = redisService.getLock(lockKey, 60 * 1000L);
-                    if (lock) {
-                        break;
-                    }
-                    Thread.sleep(SLEEP_MILLISECONDS);
-                } catch (Throwable e) {
-                    log.error(e.getMessage(), e);
+
+        boolean lock = false;
+        for (int i = 0; i < MAX_GET_LOCK_COUNT; i++) {
+            try {
+                lock = redisService.getLock(lockKey, 60 * 1000L);
+                if (lock) {
+                    break;
                 }
+                Thread.sleep(SLEEP_MILLISECONDS);
+            } catch (Throwable e) {
+                log.error(e.getMessage(), e);
             }
-            if (!lock) {
-                throw new BusinessException("SerialNumber 尝试5次，未能生成单号");
-            }
+        }
+        if (!lock) {
+            throw new BusinessException("SerialNumber 尝试5次，未能生成单号");
+        }
+
+        try {
             // 获取上次的生成结果
             SerialNumberLastGenerateBO lastGenerateBO = (SerialNumberLastGenerateBO) redisService.mget(
                     RedisKeyConst.Support.SERIAL_NUMBER_LAST_INFO,
diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/dev/sa-base.yaml b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/dev/sa-base.yaml
index 400b9780..d6802f47 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/dev/sa-base.yaml
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/dev/sa-base.yaml
@@ -67,7 +67,7 @@ spring:
 
   # 缓存实现类型
   cache:
-    type: caffeine
+    type: redis
 
 # tomcat 配置，主要用于 配置 访问日志（便于将来排查错误）
 server:
diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/ChangeLogMapper.xml b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/ChangeLogMapper.xml
index 09136785..126951f4 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/ChangeLogMapper.xml
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/ChangeLogMapper.xml
@@ -14,7 +14,7 @@
             </if>
             <!--关键字-->
             <if test="queryForm.keyword != null and queryForm.keyword != ''">
-                AND ( INSTR(t_change_log.version,#{queryForm.keyword})
+                AND ( INSTR(t_change_log.update_version,#{queryForm.keyword})
                 OR INSTR(t_change_log.publish_author,#{queryForm.keyword})
                 OR INSTR(t_change_log.content,#{queryForm.keyword})
                 )
@@ -35,12 +35,12 @@
                 AND t_change_log.link = #{queryForm.link}
             </if>
         </where>
-        order by t_change_log.version desc
+        order by t_change_log.update_version desc
     </select>
 
     <select id="selectByVersion"
             resultType="net.lab1024.sa.base.module.support.changelog.domain.entity.ChangeLogEntity">
-        select * from t_change_log where `version` = #{version}
+        select * from t_change_log where update_version = #{version}
     </select>
 
 
diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/LoginLogMapper.xml b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/LoginLogMapper.xml
index b2b88edc..cffb1b66 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/LoginLogMapper.xml
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/LoginLogMapper.xml
@@ -13,7 +13,7 @@
             <if test="query.userType != null">
                 AND user_type = #{query.userType}
             </if>
-            <if test="query.ip != null">
+            <if test="query.ip != null and query.ip != ''">
                 AND INSTR(login_ip,#{query.ip})
             </if>
             <if test="query.startDate != null and query.startDate != ''">
@@ -25,9 +25,6 @@
             <if test="query.userName != null and query.userName != ''">
                 AND INSTR(user_name,#{query.userName})
             </if>
-            <if test="query.ip != null">
-                AND INSTR(login_ip,#{query.ip})
-            </if>
         </where>
         order by create_time desc
     </select>
@@ -37,9 +34,9 @@
         *
         from t_login_log
         where
-        user_id = #{userId}
-        and user_type = #{userType}
-        and login_result = #{loginLogResult}
+            user_id = #{userId}
+            and user_type = #{userType}
+            and login_result = #{loginLogResult}
         order by login_log_id desc
         limit 1
     </select>
diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/OperateLogMapper.xml b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/OperateLogMapper.xml
index fcf1d8e1..d00adff0 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/OperateLogMapper.xml
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/OperateLogMapper.xml
@@ -23,10 +23,10 @@
                 AND INSTR(operate_user_name,#{query.userName})
             </if>
             <if test="query.keywords != null and query.keywords != ''">
-                AND (INSTR(`module`,#{query.keywords}) OR INSTR(content,#{query.keywords}))
+                AND (INSTR(module,#{query.keywords}) OR INSTR(content,#{query.keywords}))
             </if>
             <if test="query.requestKeywords != null and query.requestKeywords != ''">
-                AND (INSTR(`url`,#{query.requestKeywords}) OR INSTR(`method`,#{query.requestKeywords}) OR INSTR(`param`,#{query.requestKeywords}))
+                AND (INSTR(url,#{query.requestKeywords}) OR INSTR(method,#{query.requestKeywords}) OR INSTR(param,#{query.requestKeywords}))
             </if>
             <if test="query.successFlag != null">
                 AND success_flag = #{query.successFlag}
diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/pre/sa-base.yaml b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/pre/sa-base.yaml
index 2836bad0..d6802f47 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/pre/sa-base.yaml
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/pre/sa-base.yaml
@@ -134,7 +134,7 @@ reload:
 sa-token:
   # token 名称（同时也是 cookie 名称）
   token-name: Authorization
-  # token 前缀 例如:Bear
+  # token 前缀 例如:Bearer
   token-prefix: Bearer
   # token 有效期（单位：秒） 默认30天（2592000秒），-1 代表永久有效
   timeout: 2592000
diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/prod/sa-base.yaml b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/prod/sa-base.yaml
index 4cef6a5e..2156faab 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/prod/sa-base.yaml
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/prod/sa-base.yaml
@@ -34,6 +34,7 @@ spring:
           min-idle: 10
           max-idle: 50
           max-wait: 30000ms
+
   # 邮件，置以SSL的方式发送, 这个需要使用这种方式并且端口是465
   mail:
     host: smtp.163.com
@@ -106,7 +107,7 @@ springdoc:
 knife4j:
   enable: true
   basic:
-    enable: true
+    enable: false
     username: api # Basic认证用户名
     password: 1024 # Basic认证密码
 
@@ -131,7 +132,7 @@ reload:
 sa-token:
   # token 名称（同时也是 cookie 名称）
   token-name: Authorization
-  # token 前缀 例如:Bear
+  # token 前缀 例如:Bearer
   token-prefix: Bearer
   # token 有效期（单位：秒） 默认30天（2592000秒），-1 代表永久有效
   timeout: 2592000
diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/test/sa-base.yaml b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/test/sa-base.yaml
index 2836bad0..d6802f47 100644
--- a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/test/sa-base.yaml
+++ b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/test/sa-base.yaml
@@ -134,7 +134,7 @@ reload:
 sa-token:
   # token 名称（同时也是 cookie 名称）
   token-name: Authorization
-  # token 前缀 例如:Bear
+  # token 前缀 例如:Bearer
   token-prefix: Bearer
   # token 有效期（单位：秒） 默认30天（2592000秒），-1 代表永久有效
   timeout: 2592000
diff --git a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeService.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeService.java
index a51f432f..516f35f9 100644
--- a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeService.java
+++ b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeService.java
@@ -230,7 +230,7 @@ public class NoticeService {
                     noticeVisibleRange.setDataName(employeeEntity == null ? StringConst.EMPTY : employeeEntity.getActualName());
                 } else {
                     DepartmentVO departmentVO = departmentService.getDepartmentById(noticeVisibleRange.getDataId());
-                    noticeVisibleRange.setDataName(departmentVO == null ? StringConst.EMPTY : departmentVO.getName());
+                    noticeVisibleRange.setDataName(departmentVO == null ? StringConst.EMPTY : departmentVO.getDepartmentName());
                 }
             }
             updateFormVO.setVisibleRangeList(noticeVisibleRangeList);
diff --git a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/entity/DepartmentEntity.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/entity/DepartmentEntity.java
index a76ea7e9..4d52bb16 100644
--- a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/entity/DepartmentEntity.java
+++ b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/entity/DepartmentEntity.java
@@ -31,7 +31,7 @@ public class DepartmentEntity {
     /**
      * 部门名称
      */
-    private String name;
+    private String departmentName;
 
     /**
      * 负责人员工 id
diff --git a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/form/DepartmentAddForm.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/form/DepartmentAddForm.java
index 25ecc447..760aafee 100644
--- a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/form/DepartmentAddForm.java
+++ b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/form/DepartmentAddForm.java
@@ -21,7 +21,7 @@ public class DepartmentAddForm {
     @Schema(description = "部门名称")
     @Length(min = 1, max = 50, message = "请输入正确的部门名称(1-50个字符)")
     @NotNull(message = "请输入正确的部门名称(1-50个字符)")
-    private String name;
+    private String departmentName;
 
     @Schema(description = "排序")
     @NotNull(message = "排序值")
diff --git a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/vo/DepartmentVO.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/vo/DepartmentVO.java
index c973a959..43b2a355 100644
--- a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/vo/DepartmentVO.java
+++ b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/domain/vo/DepartmentVO.java
@@ -24,7 +24,7 @@ public class DepartmentVO implements Serializable {
     private Long departmentId;
 
     @Schema(description = "部门名称")
-    private String name;
+    private String departmentName;
 
     @Schema(description = "部门负责人姓名")
     private String managerName;
diff --git a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/manager/DepartmentCacheManager.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/manager/DepartmentCacheManager.java
index cf2bcb15..950a6f35 100644
--- a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/manager/DepartmentCacheManager.java
+++ b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/department/manager/DepartmentCacheManager.java
@@ -97,15 +97,15 @@ public class DepartmentCacheManager {
      */
     private String buildDepartmentPath(DepartmentVO departmentVO, Map<Long, DepartmentVO> departmentMap) {
         if (Objects.equals(departmentVO.getParentId(), NumberUtils.LONG_ZERO)) {
-            return departmentVO.getName();
+            return departmentVO.getDepartmentName();
         }
         //父节点
         DepartmentVO parentDepartment = departmentMap.get(departmentVO.getParentId());
         if (parentDepartment == null) {
-            return departmentVO.getName();
+            return departmentVO.getDepartmentName();
         }
         String pathName = buildDepartmentPath(parentDepartment, departmentMap);
-        return pathName + "/" + departmentVO.getName();
+        return pathName + "/" + departmentVO.getDepartmentName();
 
     }
     // ---------------------- 构造树的一些方法 ------------------------------
diff --git a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java
index a0bc7a0a..d2b97e50 100644
--- a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java
+++ b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/service/EmployeeService.java
@@ -242,8 +242,6 @@ public class EmployeeService {
     /**
      * 更新登录人头像
      *
-     * @param employeeUpdateAvatarForm
-     * @return
      */
     public ResponseDTO<String> updateAvatar(EmployeeUpdateAvatarForm employeeUpdateAvatarForm) {
         Long employeeId = employeeUpdateAvatarForm.getEmployeeId();
@@ -395,7 +393,7 @@ public class EmployeeService {
         List<EmployeeVO> voList = employeeEntityList.stream().map(e -> {
             EmployeeVO employeeVO = SmartBeanUtil.copy(e, EmployeeVO.class);
             if (department != null) {
-                employeeVO.setDepartmentName(department.getName());
+                employeeVO.setDepartmentName(department.getDepartmentName());
             }
             return employeeVO;
         }).collect(Collectors.toList());
diff --git a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/manager/LoginManager.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/manager/LoginManager.java
index e3b0c607..7dd41272 100644
--- a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/manager/LoginManager.java
+++ b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/manager/LoginManager.java
@@ -88,7 +88,7 @@ public class LoginManager {
 
         // 部门信息
         DepartmentVO department = departmentService.getDepartmentById(employeeEntity.getDepartmentId());
-        requestEmployee.setDepartmentName(null == department ? StringConst.EMPTY : department.getName());
+        requestEmployee.setDepartmentName(null == department ? StringConst.EMPTY : department.getDepartmentName());
 
         // 头像信息
         String avatar = employeeEntity.getAvatar();
diff --git a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuService.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuService.java
index 548caf60..3dbf61f2 100644
--- a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuService.java
+++ b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/service/MenuService.java
@@ -14,6 +14,7 @@ import net.lab1024.sa.base.common.code.SystemErrorCode;
 import net.lab1024.sa.base.common.domain.RequestUrlVO;
 import net.lab1024.sa.base.common.domain.ResponseDTO;
 import net.lab1024.sa.base.common.util.SmartBeanUtil;
+import net.lab1024.sa.base.common.util.SmartStringUtil;
 import org.apache.commons.lang3.math.NumberUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -134,6 +135,10 @@ public class MenuService {
      * @return true 重复 false 未重复
      */
     public <T extends MenuBaseForm> Boolean validateWebPerms(T menuDTO) {
+        if(SmartStringUtil.isEmpty(menuDTO.getWebPerms())){
+            return false;
+        }
+
         MenuEntity menu = menuDao.getByWebPerms(menuDTO.getWebPerms(), Boolean.FALSE);
         if (menuDTO instanceof MenuAddForm) {
             return menu != null;
diff --git a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleEmployeeService.java b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleEmployeeService.java
index 755aa892..b44430e4 100644
--- a/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleEmployeeService.java
+++ b/smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/role/service/RoleEmployeeService.java
@@ -72,7 +72,7 @@ public class RoleEmployeeService {
         List<Long> departmentIdList = employeeList.stream().filter(e -> e != null && e.getDepartmentId() != null).map(EmployeeVO::getDepartmentId).collect(Collectors.toList());
         if (CollectionUtils.isNotEmpty(departmentIdList)) {
             List<DepartmentEntity> departmentEntities = departmentDao.selectBatchIds(departmentIdList);
-            Map<Long, String> departmentIdNameMap = departmentEntities.stream().collect(Collectors.toMap(DepartmentEntity::getDepartmentId, DepartmentEntity::getName));
+            Map<Long, String> departmentIdNameMap = departmentEntities.stream().collect(Collectors.toMap(DepartmentEntity::getDepartmentId, DepartmentEntity::getDepartmentName));
             employeeList.forEach(e -> {
                 e.setDepartmentName(departmentIdNameMap.getOrDefault(e.getDepartmentId(), StringConst.EMPTY));
             });
diff --git a/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/business/oa/enterprise/EnterpriseEmployeeMapper.xml b/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/business/oa/enterprise/EnterpriseEmployeeMapper.xml
index 62acf08f..ba1a417f 100644
--- a/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/business/oa/enterprise/EnterpriseEmployeeMapper.xml
+++ b/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/business/oa/enterprise/EnterpriseEmployeeMapper.xml
@@ -70,7 +70,7 @@
     <select id="queryPageEmployeeList"
             resultType="net.lab1024.sa.admin.module.business.oa.enterprise.domain.vo.EnterpriseEmployeeVO">
         select
-        t_oa_enterprise_employee.*,
+        t_oa_enterprise_employee.enterprise_id,
         t_oa_enterprise.enterprise_name,
         t_employee.*,
         t_employee.actual_name as employeeName
diff --git a/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/business/oa/notice/NoticeMapper.xml b/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/business/oa/notice/NoticeMapper.xml
index 9b141c80..6b8080b1 100644
--- a/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/business/oa/notice/NoticeMapper.xml
+++ b/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/business/oa/notice/NoticeMapper.xml
@@ -219,7 +219,7 @@
     <select id="queryNoticeViewRecordList" resultType="net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeViewRecordVO">
         select t_notice_view_record.*,
         t_employee.actual_name as employeeName,
-        t_department.name as departmentName
+        t_department.department_name
         from t_notice_view_record
         left join t_employee on t_employee.employee_id = t_notice_view_record.employee_id
         left join t_department on t_department.department_id = t_employee.department_id
diff --git a/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/system/department/DepartmentMapper.xml b/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/system/department/DepartmentMapper.xml
index 8ee2974d..939008a3 100644
--- a/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/system/department/DepartmentMapper.xml
+++ b/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/system/department/DepartmentMapper.xml
@@ -6,7 +6,7 @@
     <select id="listAll" resultType="net.lab1024.sa.admin.module.system.department.domain.vo.DepartmentVO">
         SELECT t_department.*,
                t_employee.actual_name   as managerName,
-               parent_department.`name` as parentName
+               parent_department.department_name   as parentName
         FROM t_department
                  left join t_employee on t_department.manager_id = t_employee.employee_id
                  left join t_department parent_department on t_department.parent_id = parent_department.department_id
@@ -23,7 +23,7 @@
             resultType="net.lab1024.sa.admin.module.system.department.domain.vo.DepartmentVO">
         SELECT t_department.*,
                t_employee.actual_name   as managerName,
-               parent_department.`name` as parentName
+               parent_department.department_name   as parentName
         FROM t_department
                  left join t_employee on t_department.manager_id = t_employee.employee_id
                  left join t_department parent_department on t_department.parent_id = parent_department.department_id
diff --git a/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/system/employee/EmployeeMapper.xml b/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/system/employee/EmployeeMapper.xml
index 670d52ed..236a4e4b 100644
--- a/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/system/employee/EmployeeMapper.xml
+++ b/smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/system/employee/EmployeeMapper.xml
@@ -5,7 +5,7 @@
     <select id="queryEmployee" resultType="net.lab1024.sa.admin.module.system.employee.domain.vo.EmployeeVO">
         SELECT
         t_employee.*,
-        t_department.name AS departmentName
+        t_department.department_name
         FROM t_employee
         LEFT JOIN t_department ON t_department.department_id = t_employee.department_id
         <where>
@@ -169,7 +169,7 @@
 
     <select id="getEmployeeById" resultType="net.lab1024.sa.admin.module.system.employee.domain.vo.EmployeeVO">
         SELECT t_employee.*,
-               t_department.name AS departmentName
+               t_department.department_name
         FROM t_employee
                  LEFT JOIN t_department ON t_department.department_id = t_employee.department_id
         where t_employee.employee_id = #{employeeId}
@@ -178,7 +178,7 @@
     <select id="selectEmployeeByDisabledAndDeleted" resultType="net.lab1024.sa.admin.module.system.employee.domain.vo.EmployeeVO">
         SELECT
         t_employee.*,
-        t_department.name AS departmentName
+        t_department.department_name
         FROM t_employee
         LEFT JOIN t_department ON t_department.department_id = t_employee.department_id
         <where>
diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/CacheConfig.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/CacheConfig.java
index 5beb7413..2881a4b8 100644
--- a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/CacheConfig.java
+++ b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/CacheConfig.java
@@ -35,7 +35,8 @@ public class CacheConfig {
         return RedisCacheConfiguration.defaultCacheConfig()
                 .disableCachingNullValues()
                 .computePrefixWith(name -> "cache:" + name + ":")
-                .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(new GenericFastJsonRedisSerializer()));
+//                .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(new GenericFastJsonRedisSerializer()));
+        ;
     }
 
     @Bean
diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/MybatisPlusConfig.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/MybatisPlusConfig.java
index 59887aab..24117bce 100644
--- a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/MybatisPlusConfig.java
+++ b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/config/MybatisPlusConfig.java
@@ -7,6 +7,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
+
 /**
  * mp 插件
  *
diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/entity/ChangeLogEntity.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/entity/ChangeLogEntity.java
index d0bf74b9..3361a8de 100644
--- a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/entity/ChangeLogEntity.java
+++ b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/entity/ChangeLogEntity.java
@@ -28,7 +28,7 @@ public class ChangeLogEntity {
     /**
      * 版本
      */
-    private String version;
+    private String updateVersion;
 
     /**
      * 更新类型:[1:特大版本功能更新;2:功能更新;3:bug修复]
diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/form/ChangeLogAddForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/form/ChangeLogAddForm.java
index 1be8b3f6..239333ce 100644
--- a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/form/ChangeLogAddForm.java
+++ b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/form/ChangeLogAddForm.java
@@ -22,7 +22,7 @@ public class ChangeLogAddForm {
 
     @Schema(description = "版本", required = true)
     @NotBlank(message = "版本 不能为空")
-    private String version;
+    private String updateVersion;
 
     @SchemaEnum(value = ChangeLogTypeEnum.class, desc = "更新类型:[1:特大版本功能更新;2:功能更新;3:bug修复]")
     @CheckEnum(value = ChangeLogTypeEnum.class, message = "更新类型:[1:特大版本功能更新;2:功能更新;3:bug修复] 错误", required = true)
diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/form/ChangeLogUpdateForm.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/form/ChangeLogUpdateForm.java
index a8489393..13d48ce6 100644
--- a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/form/ChangeLogUpdateForm.java
+++ b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/form/ChangeLogUpdateForm.java
@@ -26,7 +26,7 @@ public class ChangeLogUpdateForm {
 
     @Schema(description = "版本", required = true)
     @NotBlank(message = "版本 不能为空")
-    private String version;
+    private String updateVersion;
 
     @SchemaEnum(value = ChangeLogTypeEnum.class, desc = "更新类型:[1:特大版本功能更新;2:功能更新;3:bug修复]")
     @CheckEnum(value = ChangeLogTypeEnum.class, message = "更新类型:[1:特大版本功能更新;2:功能更新;3:bug修复] 错误", required = true)
diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/vo/ChangeLogVO.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/vo/ChangeLogVO.java
index e8930d0f..10270f42 100644
--- a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/vo/ChangeLogVO.java
+++ b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/domain/vo/ChangeLogVO.java
@@ -23,7 +23,7 @@ public class ChangeLogVO {
     private Long changeLogId;
 
     @Schema(description = "版本")
-    private String version;
+    private String updateVersion;
 
     @SchemaEnum(value = ChangeLogTypeEnum.class, desc = "更新类型:[1:特大版本功能更新;2:功能更新;3:bug修复]")
     private Integer type;
diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/service/ChangeLogService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/service/ChangeLogService.java
index 8823211e..9fd0c846 100644
--- a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/service/ChangeLogService.java
+++ b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/service/ChangeLogService.java
@@ -44,7 +44,7 @@ public class ChangeLogService {
      * 添加
      */
     public synchronized ResponseDTO<String> add(ChangeLogAddForm addForm) {
-        ChangeLogEntity existVersion = changeLogDao.selectByVersion(addForm.getVersion());
+        ChangeLogEntity existVersion = changeLogDao.selectByVersion(addForm.getUpdateVersion());
         if (existVersion != null) {
             return ResponseDTO.userErrorParam("此版本已经存在");
         }
@@ -58,7 +58,7 @@ public class ChangeLogService {
      * 更新
      */
     public synchronized ResponseDTO<String> update(ChangeLogUpdateForm updateForm) {
-        ChangeLogEntity existVersion = changeLogDao.selectByVersion(updateForm.getVersion());
+        ChangeLogEntity existVersion = changeLogDao.selectByVersion(updateForm.getUpdateVersion());
         if (existVersion != null && !updateForm.getChangeLogId().equals(existVersion.getChangeLogId())) {
             return ResponseDTO.userErrorParam("此版本已经存在");
         }
diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/constant/CodeGeneratorConstant.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/constant/CodeGeneratorConstant.java
index 1b2fe58c..c0f436dd 100644
--- a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/constant/CodeGeneratorConstant.java
+++ b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/constant/CodeGeneratorConstant.java
@@ -11,16 +11,6 @@ package net.lab1024.sa.base.module.support.codegenerator.constant;
  */
 public class CodeGeneratorConstant {
 
-    /**
-     * 主键
-     */
-    public final static String PRIMARY_KEY = "PRI";
-
-    /**
-     * 自增
-     */
-    public final static String AUTO_INCREMENT = "auto_increment";
-
     /**
      * 默认逻辑删除字段名称
      */
diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/vo/TableColumnVO.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/vo/TableColumnVO.java
index b28c39ec..0fa76e5c 100644
--- a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/vo/TableColumnVO.java
+++ b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/vo/TableColumnVO.java
@@ -23,20 +23,26 @@ public class TableColumnVO {
     @Schema(description = "列描述")
     private String columnComment;
 
-    @Schema(description = "columnKey")
-    private String columnKey;
-
-    @Schema(description = "extra")
-    private String extra;
-
-    @Schema(description = "是否为空")
-    private String isNullable;
-
     @Schema(description = "数据类型varchar")
     private String dataType;
 
-    @Schema(description = "列类型varchar(50)")
-    private String columnType;
+    @Schema(description = "是否为空")
+    private Boolean nullableFlag;
 
+    @Schema(description = "是否为主键")
+    private Boolean primaryKeyFlag;
 
+    @Schema(description = "是否递增")
+    private Boolean autoIncreaseFlag;
+
+    // --------------- 临时字段 -------------------
+
+    @Schema(hidden = true)
+    private String columnKey;
+
+    @Schema(hidden = true)
+    private String extra;
+
+    @Schema(hidden = true)
+    private String isNullable;
 }
diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/service/DataTracerChangeContentService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/service/DataTracerChangeContentService.java
index 9aeed115..201f7e7f 100644
--- a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/service/DataTracerChangeContentService.java
+++ b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/service/DataTracerChangeContentService.java
@@ -160,6 +160,16 @@ public class DataTracerChangeContentService {
         return "【原数据】:<br/>" + oldContent + "<br/>" + "【新数据】:<br/>" + newContent;
     }
 
+    /**
+     * 解析批量bean的内容
+     *
+     * @param objectList 对象列表
+     * @return 单个内容
+     */
+    public  <T> String  getChangeContent(List<T> objectList) {
+        return this.getObjectListContent(objectList);
+    }
+
     /**
      * 获取一个对象的内容信息
      *
diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/entity/HelpDocCatalogEntity.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/entity/HelpDocCatalogEntity.java
index 3b6a2ccf..bf36ccb8 100644
--- a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/entity/HelpDocCatalogEntity.java
+++ b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/entity/HelpDocCatalogEntity.java
@@ -43,7 +43,6 @@ public class HelpDocCatalogEntity {
     /**
      * 排序
      */
-    @TableField("`sort`")
     private Integer sort;
 
 
diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/entity/HelpDocEntity.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/entity/HelpDocEntity.java
index 6dd02387..b19542c3 100644
--- a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/entity/HelpDocEntity.java
+++ b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/helpdoc/domain/entity/HelpDocEntity.java
@@ -53,7 +53,6 @@ public class HelpDocEntity {
     /**
      * 排序
      */
-    @TableField("`sort`")
     private Integer sort;
 
     /**
diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/mail/MailService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/mail/MailService.java
index ae3840ae..84adc038 100644
--- a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/mail/MailService.java
+++ b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/mail/MailService.java
@@ -47,7 +47,7 @@ import java.util.Map;
 @Component
 public class MailService {
 
-    @Autowired
+    @Resource
     private JavaMailSender javaMailSender;
 
     @Resource
diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/Level3ProtectConfigService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/Level3ProtectConfigService.java
index db573d2a..3282fcf6 100644
--- a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/Level3ProtectConfigService.java
+++ b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/securityprotect/service/Level3ProtectConfigService.java
@@ -3,6 +3,7 @@ package net.lab1024.sa.base.module.support.securityprotect.service;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import net.lab1024.sa.base.common.domain.ResponseDTO;
 import net.lab1024.sa.base.module.support.config.ConfigKeyEnum;
@@ -29,17 +30,29 @@ public class Level3ProtectConfigService {
 
     /**
      * 开启双因子登录，默认：开启
+     * -- GETTER --
+     *  开启双因子登录，默认：开启
+
      */
+    @Getter
     private boolean twoFactorLoginEnabled = false;
 
     /**
      * 连续登录失败次数则锁定，-1表示不受限制，可以一直尝试登录
+     * -- GETTER --
+     *  连续登录失败次数则锁定，-1表示不受限制，可以一直尝试登录
+
      */
+    @Getter
     private int loginFailMaxTimes = -1;
 
     /**
      * 连续登录失败锁定时间（单位：秒），-1表示不锁定，建议锁定30分钟
+     * -- GETTER --
+     *  连续登录失败锁定时间（单位：秒），-1表示不锁定，建议锁定30分钟
+
      */
+    @Getter
     private int loginFailLockSeconds = 1800;
 
     /**
@@ -49,61 +62,53 @@ public class Level3ProtectConfigService {
 
     /**
      * 密码复杂度 是否开启，默认：开启
+     * -- GETTER --
+     *  密码复杂度 是否开启，默认：开启
+
      */
+    @Getter
     private boolean passwordComplexityEnabled = true;
 
     /**
      * 定期修改密码时间间隔（默认：天），默认：建议90天更换密码
+     * -- GETTER --
+     *  定期修改密码时间间隔（默认：天），默认：建议90天更换密码
+
      */
+    @Getter
     private int regularChangePasswordDays = 90;
 
     /**
      * 定期修改密码不允许相同次数，默认：3次以内密码不能相同
+     * -- GETTER --
+     *  定期修改密码不允许相同次数，默认：3次以内密码不能相同
+
      */
+    @Getter
     private int regularChangePasswordNotAllowRepeatTimes = 3;
 
     /**
      * 文件大小限制，单位 mb ，(默认：50 mb)
+     * -- GETTER --
+     *  文件大小限制，单位 mb ，(默认：50 mb)
+
      */
+    @Getter
     private long maxUploadFileSizeMb = 50;
 
     /**
      * 文件检测，默认：不开启
+     * -- GETTER --
+     *  文件检测，默认：不开启
+
      */
+    @Getter
     private boolean fileDetectFlag = false;
 
 
     @Resource
     private ConfigService configService;
 
-    /**
-     * 文件检测，默认：不开启
-     */
-    public boolean isFileDetectFlag() {
-        return fileDetectFlag;
-    }
-
-    /**
-     * 文件大小限制，单位 mb ，(默认：50 mb)
-     */
-    public long getMaxUploadFileSizeMb() {
-        return maxUploadFileSizeMb;
-    }
-
-    /**
-     * 连续登录失败次数则锁定，-1表示不受限制，可以一直尝试登录
-     */
-    public int getLoginFailMaxTimes() {
-        return loginFailMaxTimes;
-    }
-
-    /**
-     * 连续登录失败锁定时间（单位：秒），-1表示不锁定，建议锁定30分钟
-     */
-    public int getLoginFailLockSeconds() {
-        return loginFailLockSeconds;
-    }
-
     /**
      * 最低活跃时间（单位：秒），超过此时间没有操作系统就会被冻结，默认-1 代表不限制，永不冻结; 默认 30分钟
      */
@@ -111,34 +116,6 @@ public class Level3ProtectConfigService {
         return loginActiveTimeoutSeconds > 0 ? loginActiveTimeoutSeconds : -1;
     }
 
-    /**
-     * 定期修改密码时间间隔（默认：天），默认：建议90天更换密码
-     */
-    public int getRegularChangePasswordDays() {
-        return regularChangePasswordDays;
-    }
-
-    /**
-     * 开启双因子登录，默认：开启
-     */
-    public boolean isTwoFactorLoginEnabled() {
-        return twoFactorLoginEnabled;
-    }
-
-    /**
-     * 密码复杂度 是否开启，默认：开启
-     */
-    public boolean isPasswordComplexityEnabled() {
-        return passwordComplexityEnabled;
-    }
-
-    /**
-     * 定期修改密码不允许相同次数，默认：3次以内密码不能相同
-     */
-    public int getRegularChangePasswordNotAllowRepeatTimes() {
-        return regularChangePasswordNotAllowRepeatTimes;
-    }
-
     @PostConstruct
     void init() {
         String configValue = configService.getConfigValue(ConfigKeyEnum.LEVEL3_PROTECT_CONFIG);
diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/SerialNumberBaseService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/SerialNumberBaseService.java
index 4f76dfad..95f7ed32 100644
--- a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/SerialNumberBaseService.java
+++ b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/SerialNumberBaseService.java
@@ -9,6 +9,8 @@ import net.lab1024.sa.base.module.support.serialnumber.dao.SerialNumberDao;
 import net.lab1024.sa.base.module.support.serialnumber.dao.SerialNumberRecordDao;
 import net.lab1024.sa.base.module.support.serialnumber.domain.*;
 import org.apache.commons.lang3.RandomUtils;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
@@ -92,6 +94,7 @@ public abstract class SerialNumberBaseService implements SerialNumberService {
     public abstract void initLastGenerateData(List<SerialNumberEntity> serialNumberEntityList);
 
     @Override
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
     public String generate(SerialNumberIdEnum serialNumberIdEnum) {
         List<String> generateList = this.generate(serialNumberIdEnum, 1);
         if (generateList == null || generateList.isEmpty()) {
@@ -101,6 +104,7 @@ public abstract class SerialNumberBaseService implements SerialNumberService {
     }
 
     @Override
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
     public List<String> generate(SerialNumberIdEnum serialNumberIdEnum, int count) {
         SerialNumberInfoBO serialNumberInfoBO = serialNumberMap.get(serialNumberIdEnum.getSerialNumberId());
         if (serialNumberInfoBO == null) {
diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/impl/SerialNumberRedisService.java b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/impl/SerialNumberRedisService.java
index d83d9368..6bf65f77 100644
--- a/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/impl/SerialNumberRedisService.java
+++ b/smart-admin-api-java8-springboot2/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/impl/SerialNumberRedisService.java
@@ -9,7 +9,6 @@ import net.lab1024.sa.base.module.support.serialnumber.domain.SerialNumberGenera
 import net.lab1024.sa.base.module.support.serialnumber.domain.SerialNumberInfoBO;
 import net.lab1024.sa.base.module.support.serialnumber.domain.SerialNumberLastGenerateBO;
 import net.lab1024.sa.base.module.support.serialnumber.service.SerialNumberBaseService;
-import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -61,22 +60,24 @@ public class SerialNumberRedisService extends SerialNumberBaseService {
     public List<String> generateSerialNumberList(SerialNumberInfoBO serialNumberInfo, int count) {
         SerialNumberGenerateResultBO serialNumberGenerateResult = null;
         String lockKey = RedisKeyConst.Support.SERIAL_NUMBER + serialNumberInfo.getSerialNumberId();
-        try {
-            boolean lock = false;
-            for (int i = 0; i < MAX_GET_LOCK_COUNT; i++) {
-                try {
-                    lock = redisService.getLock(lockKey, 60 * 1000L);
-                    if (lock) {
-                        break;
-                    }
-                    Thread.sleep(SLEEP_MILLISECONDS);
-                } catch (Throwable e) {
-                    log.error(e.getMessage(), e);
+
+        boolean lock = false;
+        for (int i = 0; i < MAX_GET_LOCK_COUNT; i++) {
+            try {
+                lock = redisService.getLock(lockKey, 60 * 1000L);
+                if (lock) {
+                    break;
                 }
+                Thread.sleep(SLEEP_MILLISECONDS);
+            } catch (Throwable e) {
+                log.error(e.getMessage(), e);
             }
-            if (!lock) {
-                throw new BusinessException("SerialNumber 尝试5次，未能生成单号");
-            }
+        }
+        if (!lock) {
+            throw new BusinessException("SerialNumber 尝试5次，未能生成单号");
+        }
+
+        try {
             // 获取上次的生成结果
             SerialNumberLastGenerateBO lastGenerateBO = (SerialNumberLastGenerateBO) redisService.mget(
                     RedisKeyConst.Support.SERIAL_NUMBER_LAST_INFO,
diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/ChangeLogMapper.xml b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/ChangeLogMapper.xml
index 09136785..126951f4 100644
--- a/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/ChangeLogMapper.xml
+++ b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/ChangeLogMapper.xml
@@ -14,7 +14,7 @@
             </if>
             <!--关键字-->
             <if test="queryForm.keyword != null and queryForm.keyword != ''">
-                AND ( INSTR(t_change_log.version,#{queryForm.keyword})
+                AND ( INSTR(t_change_log.update_version,#{queryForm.keyword})
                 OR INSTR(t_change_log.publish_author,#{queryForm.keyword})
                 OR INSTR(t_change_log.content,#{queryForm.keyword})
                 )
@@ -35,12 +35,12 @@
                 AND t_change_log.link = #{queryForm.link}
             </if>
         </where>
-        order by t_change_log.version desc
+        order by t_change_log.update_version desc
     </select>
 
     <select id="selectByVersion"
             resultType="net.lab1024.sa.base.module.support.changelog.domain.entity.ChangeLogEntity">
-        select * from t_change_log where `version` = #{version}
+        select * from t_change_log where update_version = #{version}
     </select>
 
 
diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/LoginLogMapper.xml b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/LoginLogMapper.xml
index b2b88edc..cffb1b66 100644
--- a/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/LoginLogMapper.xml
+++ b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/LoginLogMapper.xml
@@ -13,7 +13,7 @@
             <if test="query.userType != null">
                 AND user_type = #{query.userType}
             </if>
-            <if test="query.ip != null">
+            <if test="query.ip != null and query.ip != ''">
                 AND INSTR(login_ip,#{query.ip})
             </if>
             <if test="query.startDate != null and query.startDate != ''">
@@ -25,9 +25,6 @@
             <if test="query.userName != null and query.userName != ''">
                 AND INSTR(user_name,#{query.userName})
             </if>
-            <if test="query.ip != null">
-                AND INSTR(login_ip,#{query.ip})
-            </if>
         </where>
         order by create_time desc
     </select>
@@ -37,9 +34,9 @@
         *
         from t_login_log
         where
-        user_id = #{userId}
-        and user_type = #{userType}
-        and login_result = #{loginLogResult}
+            user_id = #{userId}
+            and user_type = #{userType}
+            and login_result = #{loginLogResult}
         order by login_log_id desc
         limit 1
     </select>
diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/OperateLogMapper.xml b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/OperateLogMapper.xml
index fcf1d8e1..d00adff0 100644
--- a/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/OperateLogMapper.xml
+++ b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/OperateLogMapper.xml
@@ -23,10 +23,10 @@
                 AND INSTR(operate_user_name,#{query.userName})
             </if>
             <if test="query.keywords != null and query.keywords != ''">
-                AND (INSTR(`module`,#{query.keywords}) OR INSTR(content,#{query.keywords}))
+                AND (INSTR(module,#{query.keywords}) OR INSTR(content,#{query.keywords}))
             </if>
             <if test="query.requestKeywords != null and query.requestKeywords != ''">
-                AND (INSTR(`url`,#{query.requestKeywords}) OR INSTR(`method`,#{query.requestKeywords}) OR INSTR(`param`,#{query.requestKeywords}))
+                AND (INSTR(url,#{query.requestKeywords}) OR INSTR(method,#{query.requestKeywords}) OR INSTR(param,#{query.requestKeywords}))
             </if>
             <if test="query.successFlag != null">
                 AND success_flag = #{query.successFlag}
diff --git a/smart-admin-web-javascript/README.en.md b/smart-admin-web-javascript/README.en.md
new file mode 100644
index 00000000..e69de29b
diff --git a/smart-admin-web-javascript/README.md b/smart-admin-web-javascript/README.md
new file mode 100644
index 00000000..e69de29b
diff --git a/smart-admin-web-javascript/src/components/system/department-tree-select/index.vue b/smart-admin-web-javascript/src/components/system/department-tree-select/index.vue
index e9de7998..053ab23f 100644
--- a/smart-admin-web-javascript/src/components/system/department-tree-select/index.vue
+++ b/smart-admin-web-javascript/src/components/system/department-tree-select/index.vue
@@ -12,7 +12,7 @@
   <a-tree-select
     :value="props.value"
     :treeData="treeData"
-    :fieldNames="{ label: 'name', key: 'departmentId', value: 'departmentId' }"
+    :fieldNames="{ label: 'departmentName', key: 'departmentId', value: 'departmentId' }"
     show-search
     style="width: 100%"
     :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
diff --git a/smart-admin-web-javascript/src/config/app-config.js b/smart-admin-web-javascript/src/config/app-config.js
index 2ef8de2f..89e852a3 100644
--- a/smart-admin-web-javascript/src/config/app-config.js
+++ b/smart-admin-web-javascript/src/config/app-config.js
@@ -29,7 +29,7 @@ export const appDefaultConfig = {
   // 标签页
   pageTagFlag: true,
   // 标签页样式: default、 antd、chrome
-  pageTagStyle: 'default',
+  pageTagStyle: 'chrome',
   // 面包屑
   breadCrumbFlag: true,
   // 页脚
diff --git a/smart-admin-web-javascript/src/views/support/change-log/change-log-form.vue b/smart-admin-web-javascript/src/views/support/change-log/change-log-form.vue
index c4d3c7ff..907f595e 100644
--- a/smart-admin-web-javascript/src/views/support/change-log/change-log-form.vue
+++ b/smart-admin-web-javascript/src/views/support/change-log/change-log-form.vue
@@ -17,8 +17,8 @@
     :destroyOnClose="true"
   >
     <a-form ref="formRef" :model="form" :rules="rules" :label-col="{ span: 5 }">
-      <a-form-item label="版本" name="version">
-        <a-input style="width: 100%" v-model:value="form.version" placeholder="版本" />
+      <a-form-item label="版本" name="updateVersion">
+        <a-input style="width: 100%" v-model:value="form.updateVersion" placeholder="版本" />
       </a-form-item>
       <a-form-item label="更新类型" name="type">
         <SmartEnumSelect width="100%" v-model:value="form.type" enumName="CHANGE_LOG_TYPE_ENUM" placeholder="更新类型" />
@@ -85,7 +85,7 @@
 
   const formDefault = {
     changeLogId: undefined,
-    version: undefined, //版本
+    updateVersion: undefined, //版本
     type: undefined, //更新类型:[1:特大版本功能更新;2:功能更新;3:bug修复]
     publishAuthor: undefined, //发布人
     publicDate: undefined, //发布日期
@@ -96,7 +96,7 @@
   let form = reactive({ ...formDefault });
 
   const rules = {
-    version: [{ required: true, message: '版本 必填' }],
+    updateVersion: [{ required: true, message: '版本 必填' }],
     type: [{ required: true, message: '更新类型:[1:特大版本功能更新;2:功能更新;3:bug修复] 必填' }],
     publishAuthor: [{ required: true, message: '发布人 必填' }],
     publicDate: [{ required: true, message: '发布日期 必填' }],
diff --git a/smart-admin-web-javascript/src/views/support/change-log/change-log-list.vue b/smart-admin-web-javascript/src/views/support/change-log/change-log-list.vue
index b2e38308..0c5c8e61 100644
--- a/smart-admin-web-javascript/src/views/support/change-log/change-log-list.vue
+++ b/smart-admin-web-javascript/src/views/support/change-log/change-log-list.vue
@@ -75,7 +75,7 @@
       :row-selection="{ selectedRowKeys: selectedRowKeyList, onChange: onSelectChange }"
     >
       <template #bodyCell="{ text, record, column }">
-        <template v-if="column.dataIndex === 'version'">
+        <template v-if="column.dataIndex === 'updateVersion'">
           <a-button @click="showModal(record)" type="link">{{ text }}</a-button>
         </template>
         <template v-if="column.dataIndex === 'type'">
@@ -135,7 +135,7 @@
   const columns = ref([
     {
       title: '版本',
-      dataIndex: 'version',
+      dataIndex: 'updateVersion',
       ellipsis: true,
     },
     {
diff --git a/smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form-field.vue b/smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form-field.vue
index 33c6a4f4..8ac2e387 100644
--- a/smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form-field.vue
+++ b/smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form-field.vue
@@ -176,9 +176,9 @@
         columnName: column.columnName,
         columnComment: column.columnComment,
         dataType: column.dataType,
-        nullableFlag: column.isNullable === 'NO',
-        primaryKeyFlag: column.columnKey === 'PRI',
-        autoIncreaseFlag: column.extra === 'auto_increment',
+        nullableFlag: column.nullableFlag,
+        primaryKeyFlag: column.primaryKeyFlag,
+        autoIncreaseFlag: column.autoIncreaseFlag,
         //表单
         fieldName: configField ? configField.fieldName : convertLowerCamel(column.columnName),
         label: configField ? configField.label : column.columnComment,
diff --git a/smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form-insert-and-update.vue b/smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form-insert-and-update.vue
index cdcb17af..d5477431 100644
--- a/smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form-insert-and-update.vue
+++ b/smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form-insert-and-update.vue
@@ -216,9 +216,9 @@
         columnName: column.columnName,
         columnComment: column.columnComment,
         dataType: column.dataType,
-        nullableFlag: column.isNullable === 'NO',
-        primaryKeyFlag: column.columnKey === 'PRI',
-        autoIncreaseFlag: column.extra === 'auto_increment',
+        nullableFlag: column.nullableFlag,
+        primaryKeyFlag: column.primaryKeyFlag,
+        autoIncreaseFlag: column.autoIncreaseFlag,
       };
 
       //表单
diff --git a/smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form.vue b/smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form.vue
index 59583ef6..069251b8 100644
--- a/smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form.vue
+++ b/smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form.vue
@@ -102,6 +102,7 @@
   const visibleFlag = ref(false);
   function showModal(table) {
     Object.assign(tableInfo, table);
+    tableInfo.createTime = table.createTime ? table.createTime : new Date();
     activeKey.value = '1';
     visibleFlag.value = true;
     nextTick(() => {
diff --git a/smart-admin-web-javascript/src/views/system/department/components/department-form-modal.vue b/smart-admin-web-javascript/src/views/system/department/components/department-form-modal.vue
index a05a9638..673d4678 100644
--- a/smart-admin-web-javascript/src/views/system/department/components/department-form-modal.vue
+++ b/smart-admin-web-javascript/src/views/system/department/components/department-form-modal.vue
@@ -14,8 +14,8 @@
         <DepartmentTreeSelect ref="departmentTreeSelect" v-model:value="formState.parentId" :defaultValueFlag="false"
           width="100%" />
       </a-form-item>
-      <a-form-item label="部门名称" name="name">
-        <a-input v-model:value.trim="formState.name" placeholder="请输入部门名称" />
+      <a-form-item label="部门名称" name="departmentName">
+        <a-input v-model:value.trim="formState.departmentName" placeholder="请输入部门名称" />
       </a-form-item>
       <a-form-item label="部门负责人" name="managerId">
         <EmployeeSelect ref="employeeSelect" placeholder="请选择部门负责人" width="100%" v-model:value="formState.managerId"
@@ -76,7 +76,7 @@ const emits = defineEmits(['refresh']);
   const defaultDepartmentForm = {
     id: undefined,
     managerId: undefined, //部门负责人
-    name: undefined,
+    departmentName: undefined,
     parentId: undefined,
     sort: 0,
   };
@@ -88,7 +88,7 @@ let formState = reactive({
 // 表单校验规则
 const rules = {
   parentId: [{ required: true, message: '上级部门不能为空' }],
-  name: [
+  departmentName: [
     { required: true, message: '部门名称不能为空' },
     { max: 50, message: '部门名称不能大于20个字符', trigger: 'blur' },
   ],
diff --git a/smart-admin-web-javascript/src/views/system/department/department-list.vue b/smart-admin-web-javascript/src/views/system/department/department-list.vue
index 29dc5dc2..14f0f7ec 100644
--- a/smart-admin-web-javascript/src/views/system/department/department-list.vue
+++ b/smart-admin-web-javascript/src/views/system/department/department-list.vue
@@ -95,8 +95,8 @@
   const columns = ref([
     {
       title: '部门名称',
-      dataIndex: 'name',
-      key: 'name',
+      dataIndex: 'departmentName',
+      key: 'departmentName',
     },
     {
       title: '负责人',
@@ -189,7 +189,7 @@
       return;
     }
     // 筛选出名称符合的部门
-    let filterDepartment = originData.filter((e) => e.name.indexOf(keywords.value) > -1);
+    let filterDepartment = originData.filter((e) => e.departmentName.indexOf(keywords.value) > -1);
     let filterDepartmentList = [];
     // 循环筛选出的部门 构建部门树
     filterDepartment.forEach((e) => {
@@ -220,7 +220,7 @@
   function addDepartment(e) {
     let data = {
       departmentId: 0,
-      name: '',
+      departmentName: '',
       parentId: e.departmentId || null,
     };
     departmentFormModal.value.showModal(data);
diff --git a/smart-admin-web-javascript/src/views/system/employee/components/department-children/index.vue b/smart-admin-web-javascript/src/views/system/employee/components/department-children/index.vue
index 9e1262ab..d809c44d 100644
--- a/smart-admin-web-javascript/src/views/system/employee/components/department-children/index.vue
+++ b/smart-admin-web-javascript/src/views/system/employee/components/department-children/index.vue
@@ -19,7 +19,7 @@
       <template #renderItem="{ item }">
         <a-list-item>
           <div class="department-item" @click="selectTree(item.departmentId)">
-            {{ item.name }}
+            {{ item.departmentName }}
             <RightOutlined />
           </div>
         </a-list-item>
diff --git a/smart-admin-web-javascript/src/views/system/employee/components/department-tree/index.vue b/smart-admin-web-javascript/src/views/system/employee/components/department-tree/index.vue
index 9c6875b3..1c290b79 100644
--- a/smart-admin-web-javascript/src/views/system/employee/components/department-tree/index.vue
+++ b/smart-admin-web-javascript/src/views/system/employee/components/department-tree/index.vue
@@ -18,7 +18,7 @@
       v-model:checkedKeys="checkedKeys"
       class="tree"
       :treeData="departmentTreeData"
-      :fieldNames="{ title: 'name', key: 'departmentId', value: 'departmentId' }"
+      :fieldNames="{ title: 'departmentName', key: 'departmentId', value: 'departmentId' }"
       style="width: 100%; overflow-x: auto"
       :style="[!height ? '' : { height: `${height}px`, overflowY: 'auto' }]"
       :checkable="props.checkable"
@@ -28,7 +28,7 @@
       @select="treeSelectChange"
     >
       <template #title="item">
-        <div>{{ item.name }}</div>
+        <div>{{ item.departmentName }}</div>
       </template>
     </a-tree>
     <div class="no-data" v-else>暂无结果</div>
@@ -158,7 +158,7 @@
     selectedDepartmentChildren.value = departmentList.value.filter((e) => e.parentId == id);
     let filterDepartmentList = [];
     recursionFilterDepartment(filterDepartmentList, id, true);
-    breadcrumb.value = filterDepartmentList.map((e) => e.name);
+    breadcrumb.value = filterDepartmentList.map((e) => e.departmentName);
   }
 
   // -----------------------  筛选 ---------------------
@@ -181,7 +181,7 @@
       return;
     }
     // 筛选出名称符合的部门
-    let filterDepartment = originData.filter((e) => e.name.indexOf(keywords.value) > -1);
+    let filterDepartment = originData.filter((e) => e.departmentName.indexOf(keywords.value) > -1);
     let filterDepartmentList = [];
     // 循环筛选出的部门 构建部门树
     filterDepartment.forEach((e) => {
diff --git a/smart-admin-web-typescript/README.md b/smart-admin-web-typescript/README.md
new file mode 100644
index 00000000..e69de29b
diff --git a/smart-admin-web-typescript/src/App.vue b/smart-admin-web-typescript/src/App.vue
index dc9b8dcf..660670a0 100644
--- a/smart-admin-web-typescript/src/App.vue
+++ b/smart-admin-web-typescript/src/App.vue
@@ -43,15 +43,16 @@
 </template>
 
 <script setup lang="ts">
-import dayjs from 'dayjs';
-import {computed, h} from 'vue';
-import {messages} from '/@/i18n';
-import {useAppConfigStore} from '/@/store/modules/system/app-config';
-import {useSpinStore} from '/@/store/modules/system/spin';
-import {Popover, theme} from 'ant-design-vue';
-import {themeColors} from '/@/theme/color.js';
-import SmartCopyIcon from '/@/components/framework/smart-copy-icon/index.vue';
+  import dayjs from 'dayjs';
+  import { computed, h, useSlots } from 'vue';
+  import { messages } from '/@/i18n';
+  import { useAppConfigStore } from '/@/store/modules/system/app-config';
+  import { useSpinStore } from '/@/store/modules/system/spin';
+  import { Popover, theme } from 'ant-design-vue';
+  import { themeColors } from '/@/theme/color.js';
+  import SmartCopyIcon from '/@/components/framework/smart-copy-icon/index.vue';
 
+  const slots = useSlots();
   const antdLocale = computed(() => messages[useAppConfigStore().language].antdLocale);
   const dayjsLocale = computed(() => messages[useAppConfigStore().language].dayjsLocale);
   dayjs.locale(dayjsLocale);
@@ -88,7 +89,6 @@ import SmartCopyIcon from '/@/components/framework/smart-copy-icon/index.vue';
       return text;
     }
   }
-
 </script>
 <style scoped lang="less">
   :deep(.ant-table-column-sorters) {
diff --git a/smart-admin-web-typescript/src/components/system/department-tree-select/index.vue b/smart-admin-web-typescript/src/components/system/department-tree-select/index.vue
index 7648c578..3df0fed5 100644
--- a/smart-admin-web-typescript/src/components/system/department-tree-select/index.vue
+++ b/smart-admin-web-typescript/src/components/system/department-tree-select/index.vue
@@ -12,7 +12,7 @@
   <a-tree-select
     :value="props.value"
     :treeData="treeData"
-    :fieldNames="{ label: 'name', key: 'departmentId', value: 'departmentId' }"
+    :fieldNames="{ label: 'departmentName', key: 'departmentId', value: 'departmentId' }"
     show-search
     style="width: 100%"
     :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
diff --git a/smart-admin-web-typescript/src/config/app-config.ts b/smart-admin-web-typescript/src/config/app-config.ts
index 2ef8de2f..89e852a3 100644
--- a/smart-admin-web-typescript/src/config/app-config.ts
+++ b/smart-admin-web-typescript/src/config/app-config.ts
@@ -29,7 +29,7 @@ export const appDefaultConfig = {
   // 标签页
   pageTagFlag: true,
   // 标签页样式: default、 antd、chrome
-  pageTagStyle: 'default',
+  pageTagStyle: 'chrome',
   // 面包屑
   breadCrumbFlag: true,
   // 页脚
diff --git a/smart-admin-web-typescript/src/layout/side-layout.vue b/smart-admin-web-typescript/src/layout/side-layout.vue
index 822555cf..5d3a30ab 100644
--- a/smart-admin-web-typescript/src/layout/side-layout.vue
+++ b/smart-admin-web-typescript/src/layout/side-layout.vue
@@ -62,7 +62,7 @@
           :url="item.meta.frameUrl"
         />
         <!--非iframe使用router-view-->
-        <div v-show="!iframeNotKeepAlivePageFlag && keepAliveIframePages.every((e) => route.name != e.name)"  style="height: 100%;" class="admin-content">
+        <div v-show="!iframeNotKeepAlivePageFlag && keepAliveIframePages.every((e) => route.name != e.name)" style="height: 100%;" class="admin-content">
           <router-view v-slot="{ Component }">
             <keep-alive :include="keepAliveIncludes">
               <component :is="Component" :key="route.name" />
diff --git a/smart-admin-web-typescript/src/layout/top-layout.vue b/smart-admin-web-typescript/src/layout/top-layout.vue
index 6ea0b159..f537117f 100644
--- a/smart-admin-web-typescript/src/layout/top-layout.vue
+++ b/smart-admin-web-typescript/src/layout/top-layout.vue
@@ -84,7 +84,7 @@
   const breadCrumbFlag = computed(() => useAppConfigStore().$state.breadCrumbFlag);
   // 页面宽度
   const pageWidth = computed(() => useAppConfigStore().$state.pageWidth);
-  
+
   let contentBoxHeight=ref()
   // 多余高度
   const dueHeight = computed(() => {
diff --git a/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-bank-list.vue b/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-bank-list.vue
index 2c8fddcc..8427a1a2 100644
--- a/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-bank-list.vue
+++ b/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-bank-list.vue
@@ -36,7 +36,7 @@
           </a-button>
         </a-button-group>
 
-        <a-button @click="addOrUpdate()" type="primary" class="smart-margin-left20">
+        <a-button @click="addOrUpdate()" type="primary" class="smart-margin-left20" v-if="$privilege('oa:bank:add')">
           <template #icon>
             <PlusOutlined />
           </template>
@@ -60,8 +60,8 @@
         </template>
         <template v-else-if="column.dataIndex === 'action'">
           <div class="smart-table-operate">
-            <a-button @click="addOrUpdate(record)" type="link">编辑</a-button>
-            <a-button @click="confirmDelete(record.bankId)" danger type="link">删除</a-button>
+            <a-button @click="addOrUpdate(record)" type="link" v-if="$privilege('oa:bank:update')">编辑</a-button>
+            <a-button @click="confirmDelete(record.bankId)" danger type="link" v-if="$privilege('oa:bank:delete')">删除</a-button>
           </div>
         </template>
       </template>
diff --git a/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-bank-operate-modal.vue b/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-bank-operate-modal.vue
index fee387a8..a8634f8b 100644
--- a/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-bank-operate-modal.vue
+++ b/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-bank-operate-modal.vue
@@ -8,8 +8,8 @@
   * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
 -->
 <template>
-  <a-modal :open="visible" :title="form.bankId ? '编辑' : '添加'" ok-text="确认" cancel-text="取消" @ok="onSubmit" @cancel="onClose">
-    <a-form ref="formRef" :model="form" :rules="rules" :label-col="{ span: 5 }" :wrapper-col="{ span: 18 }">
+  <a-modal :open="visible" :title="form.bankId ? '编辑' : '添加'" :width="700" ok-text="确认" cancel-text="取消" @ok="onSubmit" @cancel="onClose">
+    <a-form ref="formRef" :model="form" :rules="rules" :label-col="{ span: 4 }" :wrapper-col="{ span: 19 }">
       <a-form-item label="开户银行" name="bankName">
         <a-input v-model:value="form.bankName" placeholder="请输入开户银行" />
       </a-form-item>
diff --git a/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-employee-list.vue b/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-employee-list.vue
index 8465923b..49608519 100644
--- a/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-employee-list.vue
+++ b/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-employee-list.vue
@@ -16,50 +16,59 @@
         <a-button class="button-style" type="primary" @click="onSearch">搜索</a-button>
         <a-button class="button-style" type="default" @click="resetQueryEmployee">重置</a-button>
       </div>
-
       <div>
         <a-button class="button-style" type="primary" @click="addEmployee" v-privilege="'oa:enterprise:addEmployee'"> 添加员工 </a-button>
         <a-button class="button-style" type="primary" danger @click="batchDelete" v-privilege="'oa:enterprise:deleteEmployee'"> 批量移除 </a-button>
       </div>
     </div>
-    <a-table
-      :loading="tableLoading"
-      :dataSource="tableData"
-      :columns="columns"
-      :pagination="false"
-      rowKey="employeeId"
-      :row-selection="{ selectedRowKeys: selectedRowKeyList, onChange: onSelectChange }"
-      size="small"
-      bordered
-    >
-      <template #bodyCell="{ text, record, index, column }">
-        <template v-if="column.dataIndex === 'disabledFlag'">
-          <a-tag :color="text ? 'error' : 'processing'">{{ text ? '禁用' : '启用' }}</a-tag>
+    <a-card size="small" :bordered="false" :hoverable="false">
+      <a-row justify="end">
+        <TableOperator
+          class="smart-margin-bottom5"
+          v-model="columns"
+          :tableId="TABLE_ID_CONST.BUSINESS.OA.ENTERPRISE_EMPLOYEE"
+          :refresh="queryEmployee"
+        />
+      </a-row>
+      <a-table
+        :loading="tableLoading"
+        :dataSource="tableData"
+        :columns="columns"
+        :pagination="false"
+        rowKey="employeeId"
+        :row-selection="{ selectedRowKeys: selectedRowKeyList, onChange: onSelectChange }"
+        size="small"
+        bordered
+      >
+        <template #bodyCell="{ text, record, column }">
+          <template v-if="column.dataIndex === 'disabledFlag'">
+            <a-tag :color="text ? 'error' : 'processing'">{{ text ? '禁用' : '启用' }}</a-tag>
+          </template>
+          <template v-else-if="column.dataIndex === 'gender'">
+            <span>{{ $smartEnumPlugin.getDescByValue('GENDER_ENUM', text) }}</span>
+          </template>
+          <template v-if="column.dataIndex === 'operate'">
+            <a-button type="link" @click="deleteEmployee(record.employeeId)" v-privilege="'oa:enterprise:deleteEmployee'">移除</a-button>
+          </template>
         </template>
-        <template v-else-if="column.dataIndex === 'gender'">
-          <span>{{ $smartEnumPlugin.getDescByValue('GENDER_ENUM', text) }}</span>
-        </template>
-        <template v-if="column.dataIndex === 'operate'">
-          <a @click="deleteEmployee(record.employeeId)" v-privilege="'oa:enterprise:deleteEmployee'">移除</a>
-        </template>
-      </template>
-    </a-table>
-    <div class="smart-query-table-page">
-      <a-pagination
-        showSizeChanger
-        showQuickJumper
-        show-less-items
-        :pageSizeOptions="PAGE_SIZE_OPTIONS"
-        :defaultPageSize="queryForm.pageSize"
-        v-model:current="queryForm.pageNum"
-        v-model:pageSize="queryForm.pageSize"
-        :total="total"
-        @change="queryEmployee"
-        @showSizeChange="queryEmployee"
-        :show-total="showTableTotal"
-      />
-    </div>
-    <EmployeeTableSelectModal ref="selectEmployeeModal" @selectData="selectData" />
+      </a-table>
+      <div class="smart-query-table-page">
+        <a-pagination
+          showSizeChanger
+          showQuickJumper
+          show-less-items
+          :pageSizeOptions="PAGE_SIZE_OPTIONS"
+          :defaultPageSize="queryForm.pageSize"
+          v-model:current="queryForm.pageNum"
+          v-model:pageSize="queryForm.pageSize"
+          :total="total"
+          @change="queryEmployee"
+          @showSizeChange="queryEmployee"
+          :show-total="showTableTotal"
+        />
+      </div>
+      <EmployeeTableSelectModal ref="selectEmployeeModal" @selectData="selectData" />
+    </a-card>
   </div>
 </template>
 <script setup lang="ts">
@@ -72,6 +81,8 @@
   import { SmartLoading } from '/@/components/framework/smart-loading';
   import { PAGE_SIZE, PAGE_SIZE_OPTIONS, showTableTotal } from '/@/constants/common-const';
   import { smartSentry } from '/@/lib/smart-sentry';
+  import TableOperator from '/@/components/support/table-operator/index.vue';
+  import { TABLE_ID_CONST } from '/@/constants/support/table-id-const';
 
   const props = defineProps({
     enterpriseId: {
@@ -112,7 +123,8 @@
     {
       title: '操作',
       dataIndex: 'operate',
-      width: 60,
+      width: 90,
+      align: 'center',
     },
   ]);
 
@@ -271,7 +283,8 @@
     display: flex;
     align-items: center;
     justify-content: space-between;
-    margin: 20px 0;
+    padding: 10px 10px;
+    margin-bottom: 10px;
   }
 
   .button-style {
diff --git a/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-invoice-list.vue b/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-invoice-list.vue
index f9fb3143..9b11c068 100644
--- a/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-invoice-list.vue
+++ b/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-invoice-list.vue
@@ -36,7 +36,7 @@
           </a-button>
         </a-button-group>
 
-        <a-button @click="addOrUpdate()" type="primary" class="smart-margin-left20">
+        <a-button @click="addOrUpdate()" type="primary" class="smart-margin-left20" v-if="$privilege('oa:invoice:add')">
           <template #icon>
             <PlusOutlined />
           </template>
@@ -51,14 +51,14 @@
       <TableOperator class="smart-margin-bottom5" v-model="columns" :tableId="TABLE_ID_CONST.BUSINESS.OA.ENTERPRISE_INVOICE" :refresh="ajaxQuery" />
     </a-row>
     <a-table :scroll="{ x: 1300 }" size="small" :dataSource="tableData" :columns="columns" rowKey="invoiceId" :pagination="false" bordered>
-      <template #bodyCell="{ text, record, index, column }">
+      <template #bodyCell="{ record, column }">
         <template v-if="column.dataIndex === 'disabledFlag'">
           {{ record.disabledFlag ? '禁用' : '启用' }}
         </template>
         <template v-else-if="column.dataIndex === 'action'">
           <div class="smart-table-operate">
-            <a-button @click="addOrUpdate(record)" type="link">编辑</a-button>
-            <a-button @click="confirmDelete(record.invoiceId)" type="link" danger>删除</a-button>
+            <a-button @click="addOrUpdate(record)" type="link" v-if="$privilege('oa:invoice:update')">编辑</a-button>
+            <a-button @click="confirmDelete(record.invoiceId)" type="link" danger v-if="$privilege('oa:invoice:delete')">删除</a-button>
           </div>
         </template>
       </template>
diff --git a/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-invoice-operate-modal.vue b/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-invoice-operate-modal.vue
index 3dd27573..efc92458 100644
--- a/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-invoice-operate-modal.vue
+++ b/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-invoice-operate-modal.vue
@@ -8,8 +8,8 @@
   * @Copyright  1024创新实验室 （ https://1024lab.net ），Since 2012 
 -->
 <template>
-  <a-modal :open="visible" :title="form.invoiceId ? '编辑' : '添加'" ok-text="确认" cancel-text="取消" @ok="onSubmit" @cancel="onClose">
-    <a-form ref="formRef" :model="form" :rules="rules" :label-col="{ span: 5 }" :wrapper-col="{ span: 12 }">
+  <a-modal :open="visible" :title="form.invoiceId ? '编辑' : '添加'" :width="700" ok-text="确认" cancel-text="取消" @ok="onSubmit" @cancel="onClose">
+    <a-form ref="formRef" :model="form" :rules="rules" :label-col="{ span: 4 }" :wrapper-col="{ span: 19 }">
       <a-form-item label="开票抬头" name="invoiceHeads">
         <a-input v-model:value="form.invoiceHeads" placeholder="请输入开票抬头" />
       </a-form-item>
diff --git a/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-operate-modal.vue b/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-operate-modal.vue
index 80d6b617..8215c67a 100644
--- a/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-operate-modal.vue
+++ b/smart-admin-web-typescript/src/views/business/oa/enterprise/components/enterprise-operate-modal.vue
@@ -1,6 +1,15 @@
 <template>
-  <a-modal :open="visible" title="添加" :width="700" forceRender ok-text="确认" cancel-text="取消" @ok="onSubmit" @cancel="onClose">
-    <a-form ref="formRef" :model="form" :rules="rules" :label-col="{ span: 6 }">
+  <a-modal
+    :open="visible"
+    :title="form.enterpriseId ? '编辑' : '添加'"
+    :width="700"
+    forceRender
+    ok-text="确认"
+    cancel-text="取消"
+    @ok="onSubmit"
+    @cancel="onClose"
+  >
+    <a-form ref="formRef" :model="form" :rules="rules" :label-col="{ span: 5 }" :wrapper-col="{ span: 18 }">
       <a-form-item label="企业名称" name="enterpriseName">
         <a-input v-model:value="form.enterpriseName" placeholder="请输入企业名称" />
       </a-form-item>
diff --git a/smart-admin-web-typescript/src/views/support/change-log/change-log-form.vue b/smart-admin-web-typescript/src/views/support/change-log/change-log-form.vue
index 7de1281e..ef468877 100644
--- a/smart-admin-web-typescript/src/views/support/change-log/change-log-form.vue
+++ b/smart-admin-web-typescript/src/views/support/change-log/change-log-form.vue
@@ -17,8 +17,8 @@
     :destroyOnClose="true"
   >
     <a-form ref="formRef" :model="form" :rules="rules" :label-col="{ span: 5 }">
-      <a-form-item label="版本" name="version">
-        <a-input style="width: 100%" v-model:value="form.version" placeholder="版本" />
+      <a-form-item label="版本" name="updateVersion">
+        <a-input style="width: 100%" v-model:value="form.updateVersion" placeholder="版本" />
       </a-form-item>
       <a-form-item label="更新类型" name="type">
         <SmartEnumSelect width="100%" v-model:value="form.type" enumName="CHANGE_LOG_TYPE_ENUM" placeholder="更新类型" />
@@ -85,7 +85,7 @@
 
   const formDefault = {
     changeLogId: undefined,
-    version: undefined, //版本
+    updateVersion: undefined, //版本
     type: undefined, //更新类型:[1:特大版本功能更新;2:功能更新;3:bug修复]
     publishAuthor: undefined, //发布人
     publicDate: undefined, //发布日期
@@ -96,7 +96,7 @@
   let form = reactive({ ...formDefault });
 
   const rules = {
-    version: [{ required: true, message: '版本 必填' }],
+    updateVersion: [{ required: true, message: '版本 必填' }],
     type: [{ required: true, message: '更新类型:[1:特大版本功能更新;2:功能更新;3:bug修复] 必填' }],
     publishAuthor: [{ required: true, message: '发布人 必填' }],
     publicDate: [{ required: true, message: '发布日期 必填' }],
diff --git a/smart-admin-web-typescript/src/views/support/change-log/change-log-list.vue b/smart-admin-web-typescript/src/views/support/change-log/change-log-list.vue
index af381413..3491dc8e 100644
--- a/smart-admin-web-typescript/src/views/support/change-log/change-log-list.vue
+++ b/smart-admin-web-typescript/src/views/support/change-log/change-log-list.vue
@@ -75,7 +75,7 @@
       :row-selection="{ selectedRowKeys: selectedRowKeyList, onChange: onSelectChange }"
     >
       <template #bodyCell="{ text, record, column }">
-        <template v-if="column.dataIndex === 'version'">
+        <template v-if="column.dataIndex === 'updateVersion'">
           <a-button @click="showModal(record)" type="link">{{ text }}</a-button>
         </template>
         <template v-if="column.dataIndex === 'type'">
@@ -135,7 +135,7 @@
   const columns = ref([
     {
       title: '版本',
-      dataIndex: 'version',
+      dataIndex: 'updateVersion',
       ellipsis: true,
     },
     {
diff --git a/smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form-field.vue b/smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form-field.vue
index ef1823ca..3e8e2ae0 100644
--- a/smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form-field.vue
+++ b/smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form-field.vue
@@ -176,9 +176,9 @@
         columnName: column.columnName,
         columnComment: column.columnComment,
         dataType: column.dataType,
-        nullableFlag: column.isNullable === 'NO',
-        primaryKeyFlag: column.columnKey === 'PRI',
-        autoIncreaseFlag: column.extra === 'auto_increment',
+        nullableFlag: column.nullableFlag,
+        primaryKeyFlag: column.primaryKeyFlag,
+        autoIncreaseFlag: column.autoIncreaseFlag,
         //表单
         fieldName: configField ? configField.fieldName : convertLowerCamel(column.columnName),
         label: configField ? configField.label : column.columnComment,
diff --git a/smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form-insert-and-update.vue b/smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form-insert-and-update.vue
index 3e39239c..ca71781a 100644
--- a/smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form-insert-and-update.vue
+++ b/smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form-insert-and-update.vue
@@ -216,9 +216,9 @@
         columnName: column.columnName,
         columnComment: column.columnComment,
         dataType: column.dataType,
-        nullableFlag: column.isNullable === 'NO',
-        primaryKeyFlag: column.columnKey === 'PRI',
-        autoIncreaseFlag: column.extra === 'auto_increment',
+        nullableFlag: column.nullableFlag,
+        primaryKeyFlag: column.primaryKeyFlag,
+        autoIncreaseFlag: column.autoIncreaseFlag,
       };
 
       //表单
diff --git a/smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form.vue b/smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form.vue
index 899de878..b59b4978 100644
--- a/smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form.vue
+++ b/smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form.vue
@@ -102,6 +102,7 @@
   const visibleFlag = ref(false);
   function showModal(table) {
     Object.assign(tableInfo, table);
+    tableInfo.createTime = table.createTime ? table.createTime : new Date();
     activeKey.value = '1';
     visibleFlag.value = true;
     nextTick(() => {
diff --git a/smart-admin-web-typescript/src/views/system/department/components/department-form-modal.vue b/smart-admin-web-typescript/src/views/system/department/components/department-form-modal.vue
index ac012a5e..329f121f 100644
--- a/smart-admin-web-typescript/src/views/system/department/components/department-form-modal.vue
+++ b/smart-admin-web-typescript/src/views/system/department/components/department-form-modal.vue
@@ -14,8 +14,8 @@
         <DepartmentTreeSelect ref="departmentTreeSelect" v-model:value="formState.parentId" :defaultValueFlag="false"
           width="100%" />
       </a-form-item>
-      <a-form-item label="部门名称" name="name">
-        <a-input v-model:value.trim="formState.name" placeholder="请输入部门名称" />
+      <a-form-item label="部门名称" name="departmentName">
+        <a-input v-model:value.trim="formState.departmentName" placeholder="请输入部门名称" />
       </a-form-item>
       <a-form-item label="部门负责人" name="managerId">
         <EmployeeSelect ref="employeeSelect" placeholder="请选择部门负责人" width="100%" v-model:value="formState.managerId"
@@ -76,7 +76,7 @@ const emits = defineEmits(['refresh']);
   const defaultDepartmentForm = {
     id: undefined,
     managerId: undefined, //部门负责人
-    name: undefined,
+    departmentName: undefined,
     parentId: undefined,
     sort: 0,
   };
@@ -88,7 +88,7 @@ let formState = reactive({
 // 表单校验规则
 const rules = {
   parentId: [{ required: true, message: '上级部门不能为空' }],
-  name: [
+  departmentName: [
     { required: true, message: '部门名称不能为空' },
     { max: 50, message: '部门名称不能大于20个字符', trigger: 'blur' },
   ],
diff --git a/smart-admin-web-typescript/src/views/system/department/department-list.vue b/smart-admin-web-typescript/src/views/system/department/department-list.vue
index 84b15fee..bee92240 100644
--- a/smart-admin-web-typescript/src/views/system/department/department-list.vue
+++ b/smart-admin-web-typescript/src/views/system/department/department-list.vue
@@ -95,8 +95,8 @@
   const columns = ref([
     {
       title: '部门名称',
-      dataIndex: 'name',
-      key: 'name',
+      dataIndex: 'departmentName',
+      key: 'departmentName',
     },
     {
       title: '负责人',
@@ -189,7 +189,7 @@
       return;
     }
     // 筛选出名称符合的部门
-    let filterDepartment = originData.filter((e) => e.name.indexOf(keywords.value) > -1);
+    let filterDepartment = originData.filter((e) => e.departmentName.indexOf(keywords.value) > -1);
     let filterDepartmentList = [];
     // 循环筛选出的部门 构建部门树
     filterDepartment.forEach((e) => {
@@ -220,7 +220,7 @@
   function addDepartment(e) {
     let data = {
       departmentId: 0,
-      name: '',
+      departmentName: '',
       parentId: e.departmentId || null,
     };
     departmentFormModal.value.showModal(data);
diff --git a/smart-admin-web-typescript/src/views/system/employee/components/department-children/index.vue b/smart-admin-web-typescript/src/views/system/employee/components/department-children/index.vue
index 7e49306e..f4c86b86 100644
--- a/smart-admin-web-typescript/src/views/system/employee/components/department-children/index.vue
+++ b/smart-admin-web-typescript/src/views/system/employee/components/department-children/index.vue
@@ -19,7 +19,7 @@
       <template #renderItem="{ item }">
         <a-list-item>
           <div class="department-item" @click="selectTree(item.departmentId)">
-            {{ item.name }}
+            {{ item.departmentName }}
             <RightOutlined />
           </div>
         </a-list-item>
diff --git a/smart-admin-web-typescript/src/views/system/employee/components/department-tree/index.vue b/smart-admin-web-typescript/src/views/system/employee/components/department-tree/index.vue
index b4acfd63..96c0daaf 100644
--- a/smart-admin-web-typescript/src/views/system/employee/components/department-tree/index.vue
+++ b/smart-admin-web-typescript/src/views/system/employee/components/department-tree/index.vue
@@ -18,7 +18,7 @@
       v-model:checkedKeys="checkedKeys"
       class="tree"
       :treeData="departmentTreeData"
-      :fieldNames="{ title: 'name', key: 'departmentId', value: 'departmentId' }"
+      :fieldNames="{ title: 'departmentName', key: 'departmentId', value: 'departmentId' }"
       style="width: 100%; overflow-x: auto"
       :style="[!height ? '' : { height: `${height}px`, overflowY: 'auto' }]"
       :checkable="props.checkable"
@@ -28,7 +28,7 @@
       @select="treeSelectChange"
     >
       <template #title="item">
-        <div>{{ item.name }}</div>
+        <div>{{ item.departmentName }}</div>
       </template>
     </a-tree>
     <div class="no-data" v-else>暂无结果</div>
@@ -158,7 +158,7 @@
     selectedDepartmentChildren.value = departmentList.value.filter((e) => e.parentId == id);
     let filterDepartmentList = [];
     recursionFilterDepartment(filterDepartmentList, id, true);
-    breadcrumb.value = filterDepartmentList.map((e) => e.name);
+    breadcrumb.value = filterDepartmentList.map((e) => e.departmentName);
   }
 
   // -----------------------  筛选 ---------------------
@@ -181,7 +181,7 @@
       return;
     }
     // 筛选出名称符合的部门
-    let filterDepartment = originData.filter((e) => e.name.indexOf(keywords.value) > -1);
+    let filterDepartment = originData.filter((e) => e.departmentName.indexOf(keywords.value) > -1);
     let filterDepartmentList = [];
     // 循环筛选出的部门 构建部门树
     filterDepartment.forEach((e) => {
diff --git a/sql/README.md b/sql/README.md
index 38a23d1a..ef4e96cb 100644
--- a/sql/README.md
+++ b/sql/README.md
@@ -1,5 +1,5 @@
 ### 数据库脚本
-
+默认数据库为Mysql，若为其他数据库，请关注：[SmartAdmin其他数据库](https://smartadmin.vip/views/other/china-db/)
 
 #### 第一次
 如果是第一次部署，只需要执行 smart_admin_v3.sql 文件中的SQL语句即可；
diff --git a/sql/smart_admin_v3.sql b/sql/smart_admin_v3.sql
index 1bf3cc83..75d7c0f6 100644
--- a/sql/smart_admin_v3.sql
+++ b/sql/smart_admin_v3.sql
@@ -54,7 +54,7 @@ INSERT INTO `t_category` VALUES (360, 'iphone', 1, 352, 0, 0, 0, NULL, '2023-12-
 DROP TABLE IF EXISTS `t_change_log`;
 CREATE TABLE `t_change_log`  (
   `change_log_id` bigint(0) NOT NULL AUTO_INCREMENT COMMENT '更新日志id',
-  `version` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '版本',
+  `update_version` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '版本',
   `type` int(0) NOT NULL COMMENT '更新类型:[1:特大版本功能更新;2:功能更新;3:bug修复]',
   `publish_author` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '发布人',
   `public_date` date NOT NULL COMMENT '发布日期',
@@ -63,7 +63,7 @@ CREATE TABLE `t_change_log`  (
   `create_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
   `update_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间',
   PRIMARY KEY (`change_log_id`) USING BTREE,
-  UNIQUE INDEX `version_unique`(`version`) USING BTREE
+  UNIQUE INDEX `version_unique`(`update_version`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 19 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统更新日志' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
@@ -96,8 +96,7 @@ CREATE TABLE `t_code_generator_config`  (
   `detail` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '详情',
   `create_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
   `update_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间',
-  PRIMARY KEY (`table_name`) USING BTREE,
-  UNIQUE INDEX `table_unique`(`table_name`) USING BTREE
+  PRIMARY KEY (`table_name`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '代码生成器的每个表的配置' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
@@ -165,7 +164,7 @@ INSERT INTO `t_data_tracer` VALUES (99, 12, 1, '', NULL, NULL, NULL, 1, 1, '管
 DROP TABLE IF EXISTS `t_department`;
 CREATE TABLE `t_department`  (
   `department_id` bigint(0) NOT NULL AUTO_INCREMENT COMMENT '部门主键id',
-  `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '部门名称',
+  `department_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '部门名称',
   `manager_id` bigint(0) NULL DEFAULT NULL COMMENT '部门负责人id',
   `parent_id` bigint(0) NOT NULL DEFAULT 0 COMMENT '部门的父级id',
   `sort` int(0) NOT NULL COMMENT '部门排序',
@@ -309,8 +308,7 @@ CREATE TABLE `t_file`  (
   `create_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
   PRIMARY KEY (`file_id`) USING BTREE,
   UNIQUE INDEX `uk_file_key`(`file_key`) USING BTREE,
-  INDEX `module_id_module_type`(`folder_type`) USING BTREE,
-  INDEX `module_type`(`folder_type`) USING BTREE
+  INDEX `module_id_module_type`(`folder_type`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 108 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '文件' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
@@ -414,8 +412,7 @@ CREATE TABLE `t_help_doc_relation`  (
   `help_doc_id` bigint(0) NOT NULL COMMENT '文档id',
   `create_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP,
   `update_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0),
-  PRIMARY KEY (`relation_id`, `help_doc_id`) USING BTREE,
-  UNIQUE INDEX `uni_menu_help_doc`(`relation_id`, `help_doc_id`) USING BTREE
+  PRIMARY KEY (`relation_id`, `help_doc_id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '帮助文档-关联表' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
@@ -439,8 +436,7 @@ CREATE TABLE `t_help_doc_view_record`  (
   `last_user_agent` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '最后一次用户设备等标识',
   `create_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP,
   `update_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0),
-  PRIMARY KEY (`help_doc_id`, `user_id`) USING BTREE,
-  UNIQUE INDEX `uk_notice_employee`(`help_doc_id`, `user_id`) USING BTREE COMMENT '资讯员工'
+  PRIMARY KEY (`help_doc_id`, `user_id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '帮助文档-查看记录' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
@@ -494,8 +490,7 @@ CREATE TABLE `t_mail_template`  (
   `disable_flag` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否禁用',
   `update_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '创建时间',
   `create_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-  PRIMARY KEY (`template_code`) USING BTREE,
-  UNIQUE INDEX `template_code`(`template_code`) USING BTREE
+  PRIMARY KEY (`template_code`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 2 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
@@ -516,8 +511,8 @@ CREATE TABLE `t_menu`  (
   `path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '路由地址',
   `component` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '组件路径',
   `perms_type` int(0) NULL DEFAULT NULL COMMENT '权限类型',
-  `api_perms` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '后端权限字符串',
-  `web_perms` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '前端权限字符串',
+  `api_perms` varchar(5000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '后端权限字符串',
+  `web_perms` varchar(5000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '前端权限字符串',
   `icon` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '菜单图标',
   `context_menu_id` bigint(0) NULL DEFAULT NULL COMMENT '功能点关联菜单ID',
   `frame_flag` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否为外链',
diff --git a/sql/sql-update-log/v3.21.0.sql b/sql/sql-update-log/v3.21.0.sql
new file mode 100644
index 00000000..58a4d7f6
--- /dev/null
+++ b/sql/sql-update-log/v3.21.0.sql
@@ -0,0 +1,84 @@
+
+-- ----------------------------
+-- Table structure for t_change_log
+-- ----------------------------
+DROP TABLE IF EXISTS `t_change_log`;
+CREATE TABLE `t_change_log`  (
+  `change_log_id` bigint(0) NOT NULL AUTO_INCREMENT COMMENT '更新日志id',
+  `update_version` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '版本',
+  `type` int(0) NOT NULL COMMENT '更新类型:[1:特大版本功能更新;2:功能更新;3:bug修复]',
+  `publish_author` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '发布人',
+  `public_date` date NOT NULL COMMENT '发布日期',
+  `content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新内容',
+  `link` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '跳转链接',
+  `create_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间',
+  PRIMARY KEY (`change_log_id`) USING BTREE,
+  UNIQUE INDEX `version_unique`(`update_version`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 19 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统更新日志' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of t_change_log
+-- ----------------------------
+INSERT INTO `t_change_log` VALUES (2, 'v1.1.0', 2, '卓大', '2020-05-09', 'SmartAdmin中后台系统 v1.1.0 版本（20200422）正式更新上线，更新内容如下：\n\n1.【新增】增加员工姓名查询\n\n2.【新增】增加文件预览组件\n\n3.【新增】新增四级菜单\n', 'http://smartadmin.1024lab.net/views/1.x/base/About.html', '2022-10-04 21:33:50', '2022-10-04 21:33:50');
+INSERT INTO `t_change_log` VALUES (8, 'v1.0.0', 1, '卓大', '2019-11-01', 'SmartAdmin中后台系统 v1.0.0 版本（20191101）正式更新上线，更新内容如下：\n\n1.【新增】人员管理\n\n2.【新增】系统设置\n\n3.【新增】心跳服务\n\n4.【新增】动态加载\n\n5.【新增】缓存策略\n\n6.【新增】定时任务', 'http://smartadmin.1024lab.net/views/1.x/base/About.html', '2022-10-04 21:33:50', '2022-10-04 21:33:50');
+INSERT INTO `t_change_log` VALUES (9, 'v1.2.0', 2, '卓大', '2020-05-23', 'SmartAdmin中后台系统 v1.2.0 版本（20200515）正式更新上线，更新内容如下：\n\n1.【新增】增加数据权限\n\n2.【新增】帮助文档', NULL, '2022-10-04 21:33:50', '2022-10-04 21:33:50');
+INSERT INTO `t_change_log` VALUES (10, 'v1.2.1', 3, '卓大', '2020-05-24', 'SmartAdmin中后台系统 v1.2.1 版本（20200524）正式更新上线，更新内容如下：\n\n1.【修复】四级菜单权限bug\n\n2.【修复】缓存keepalive的Bug\n\n', NULL, '2022-10-04 21:33:50', '2022-10-04 21:33:50');
+INSERT INTO `t_change_log` VALUES (11, 'v1.3.0', 2, '卓大', '2020-06-01', 'SmartAdmin中后台系统 v1.3.0 版本（20200601）正式更新上线，更新内容如下：\n\n1.【新增】工作台看板功能\n\n2.【新增】天气预报功能\n\n3.【新增】记录上次登录IP功能', NULL, '2022-10-04 21:33:50', '2022-10-04 21:33:50');
+INSERT INTO `t_change_log` VALUES (12, 'v1.4.0', 2, '卓大', '2020-06-06', 'SmartAdmin中后台系统 v1.4.0 版本（20200606）正式更新上线，更新内容如下：\n\n1.【新增】联系客服功能\n\n2.【新增】意见反馈功能', NULL, '2022-10-04 21:33:50', '2022-10-04 21:33:50');
+INSERT INTO `t_change_log` VALUES (13, 'v1.5.0', 2, '卓大', '2020-06-14', 'SmartAdmin中后台系统 v1.5.0 版本（20200614）正式更新上线，更新内容如下：\n\n1.【新增】OA系统\n\n2.【新增】通知公告', NULL, '2022-10-04 21:33:50', '2022-10-04 21:33:50');
+INSERT INTO `t_change_log` VALUES (14, 'v1.6.0', 2, '卓大', '2020-06-17', 'SmartAdmin中后台系统 v1.6.0 版本（20200617）正式更新上线，更新内容如下：\n\n1.【新增】代码生成\n\n2.【新增】通知公告', NULL, '2022-10-04 21:33:50', '2022-10-04 21:33:50');
+INSERT INTO `t_change_log` VALUES (15, 'v2.0.0', 1, '卓大', '2022-10-22', 'SmartAdmin中后台系统 v2.0.0 版本（20191101）正式更新上线，更新内容如下：\n\n1.【新增】人员管理\n\n2.【新增】系统设置\n\n3.【新增】心跳服务\n\n4.【新增】动态加载\n\n5.【新增】缓存策略\n\n6.【新增】定时任务', 'http://smartadmin.1024lab.net/views/1.x/base/About.html', '2022-10-04 21:33:50', '2022-10-04 21:33:50');
+INSERT INTO `t_change_log` VALUES (16, 'v1.7.0', 2, '卓大', '2022-10-22', 'SmartAdmin中后台系统 v1.7.0 版本（20200624）正式更新上线，更新内容如下：\n\n1.【新增】商品管理\n\n2.【新增】商品分类', NULL, '2022-10-04 21:33:50', '2022-10-04 21:33:50');
+INSERT INTO `t_change_log` VALUES (18, 'v3.0.0', 1, '卓大', '2024-01-01', 'SmartAdmin中后台系统 v3.0.0 版本（20240101）正式更新上线，更新内容如下：\n\n\n1、【新增】权限从SpringSecurity 转成 Sa-Token\n\n2、【新增】增加接口 加密、解密功能\n\n3、【新增】增加网络安全相关功能：登录限制、密码复杂度、最大在线时长等\n\n4、【新增】ant desgin vue 为 4.x 最新版本\n\n5、【新增】升级 vite5\n\n6、【新增】swagger增加knife4j接口文档\n\n7、【优化】后端sa-common 改名为 sa-base\n\n8、【优化】优化官网文档说明\n', NULL, '2022-10-04 21:33:50', '2022-10-04 21:33:50');
+
+
+-- ----------------------------
+-- Table structure for t_code_generator_config
+-- ----------------------------
+DROP TABLE IF EXISTS `t_code_generator_config`;
+CREATE TABLE `t_code_generator_config`  (
+  `table_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '表名',
+  `basic` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '基础命名信息',
+  `fields` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '字段列表',
+  `insert_and_update` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '新建、修改',
+  `delete_info` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '删除',
+  `query_fields` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '查询',
+  `table_fields` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '列表',
+  `detail` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '详情',
+  `create_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '更新时间',
+  PRIMARY KEY (`table_name`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '代码生成器的每个表的配置' ROW_FORMAT = Dynamic;
+
+
+-- ----------------------------
+-- Table structure for t_department
+-- ----------------------------
+DROP TABLE IF EXISTS `t_department`;
+CREATE TABLE `t_department`  (
+  `department_id` bigint(0) NOT NULL AUTO_INCREMENT COMMENT '部门主键id',
+  `department_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '部门名称',
+  `manager_id` bigint(0) NULL DEFAULT NULL COMMENT '部门负责人id',
+  `parent_id` bigint(0) NOT NULL DEFAULT 0 COMMENT '部门的父级id',
+  `sort` int(0) NOT NULL COMMENT '部门排序',
+  `update_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
+  `create_time` datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  PRIMARY KEY (`department_id`) USING BTREE,
+  INDEX `parent_id`(`parent_id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 9 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = '部门' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Records of t_department
+-- ----------------------------
+INSERT INTO `t_department` VALUES (1, '1024创新实验室', 1, 0, 1, '2022-10-19 20:17:09', '2022-10-19 20:17:09');
+INSERT INTO `t_department` VALUES (2, '开发部', 44, 1, 1000, '2022-10-19 20:22:23', '2022-10-19 20:22:23');
+INSERT INTO `t_department` VALUES (3, '产品部', 2, 1, 99, '2022-10-21 10:25:30', '2022-10-21 10:25:30');
+INSERT INTO `t_department` VALUES (4, '销售部', 64, 1, 9, '2022-10-21 10:25:47', '2022-10-21 10:25:47');
+INSERT INTO `t_department` VALUES (5, '测试部', 48, 1, 0, '2022-11-05 10:54:18', '2022-11-05 10:54:18');
+INSERT INTO `t_department` VALUES (7, '直播组', 44, 1, 1111, '2024-07-02 19:38:15', '2024-07-02 19:38:15');
+INSERT INTO `t_department` VALUES (8, '抖音组', 47, 7, 0, '2024-07-02 19:39:11', '2024-07-02 19:39:11');
+
+
+
+