diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8e0a711
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+.idea/
+logs/
+target/
+*.iml
+*.http
+*.env.json
+*.json
+/src/test/
diff --git a/cms-api/cms-admin-svc/src/main/java/com/qs/serve/Application.java b/cms-api/cms-admin-svc/src/main/java/com/qs/serve/Application.java
index af6486a..3a2f9ea 100644
--- a/cms-api/cms-admin-svc/src/main/java/com/qs/serve/Application.java
+++ b/cms-api/cms-admin-svc/src/main/java/com/qs/serve/Application.java
@@ -1,6 +1,6 @@
 package com.qs.serve;
 
-import com.qs.serve.common.config.DevEnvironmentConfig;
+import com.qs.serve.framework.base.config.DevEnvironmentConfig;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/cms-api/cms-admin-svc/src/main/java/com/qs/serve/controller/AdminPortalController.java b/cms-api/cms-admin-svc/src/main/java/com/qs/serve/controller/AdminPortalController.java
index a4d8535..c3b53cd 100644
--- a/cms-api/cms-admin-svc/src/main/java/com/qs/serve/controller/AdminPortalController.java
+++ b/cms-api/cms-admin-svc/src/main/java/com/qs/serve/controller/AdminPortalController.java
@@ -2,18 +2,19 @@ package com.qs.serve.controller;
 
 import cn.hutool.crypto.SecureUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.config.properties.ProjectProperties;
-import com.qs.serve.common.framework.redis.RedisService;
-import com.qs.serve.common.framework.security.model.LoginUserType;
-import com.qs.serve.common.model.annotation.LimitSubmit;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.consts.GySysConst;
-import com.qs.serve.common.model.consts.RedisCacheKeys;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.dto.SimpleKeyValue;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.util.*;
-import com.qs.serve.common.util.model.DateFormatString;
+import com.qs.serve.framework.base.config.properties.ProjectProperties;
+import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.framework.base.framework.security.model.LoginUserType;
+import com.qs.serve.common.annotation.LimitSubmit;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.consts.GySysConst;
+import com.qs.serve.framework.base.model.consts.RedisCacheKeys;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.model.dto.SimpleKeyValue;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.framework.base.util.model.DateFormatString;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.controller.dto.SyLoginParam;
 import com.qs.serve.modules.seeyon.SyKeyLoginUtil;
 import com.qs.serve.modules.bms.service.BmsSupplierAddressService;
diff --git a/cms-api/cms-admin-svc/src/main/java/com/qs/serve/controller/CommonController.java b/cms-api/cms-admin-svc/src/main/java/com/qs/serve/controller/CommonController.java
index d657ac7..73a16b4 100644
--- a/cms-api/cms-admin-svc/src/main/java/com/qs/serve/controller/CommonController.java
+++ b/cms-api/cms-admin-svc/src/main/java/com/qs/serve/controller/CommonController.java
@@ -1,12 +1,12 @@
 package com.qs.serve.controller;
 
-import com.qs.serve.common.config.properties.UploadProperties;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.util.IdUtil;
-import com.qs.serve.common.util.JwtUtils;
-import com.qs.serve.common.util.UploadUtil;
+import com.qs.serve.framework.base.config.properties.UploadProperties;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.framework.base.util.IdUtil;
+import com.qs.serve.framework.base.util.JwtUtils;
+import com.qs.serve.framework.base.util.UploadUtil;
 import com.qs.serve.modules.oss.service.OssService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
diff --git a/cms-api/cms-admin-svc/src/main/java/com/qs/serve/controller/WxSvcLoginApi.java b/cms-api/cms-admin-svc/src/main/java/com/qs/serve/controller/WxSvcLoginApi.java
index 15b7f39..94b3e17 100644
--- a/cms-api/cms-admin-svc/src/main/java/com/qs/serve/controller/WxSvcLoginApi.java
+++ b/cms-api/cms-admin-svc/src/main/java/com/qs/serve/controller/WxSvcLoginApi.java
@@ -1,15 +1,18 @@
 package com.qs.serve.controller;
 
-import com.qs.serve.common.framework.redis.RedisService;
-import com.qs.serve.common.framework.security.model.LoginUser;
-import com.qs.serve.common.framework.security.model.LoginUserType;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.consts.RedisCacheKeys;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.HttpCode;
-import com.qs.serve.common.model.enums.InterType;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.framework.base.framework.security.model.LoginUser;
+import com.qs.serve.framework.base.framework.security.model.LoginUserType;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.consts.RedisCacheKeys;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.HttpCode;
+import com.qs.serve.common.enums.InterType;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.ServletUtils;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
 import com.qs.serve.modules.sys.mapper.SysTenantMapper;
 import com.qs.serve.modules.sys.service.SysUserService;
diff --git a/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/HisTask.java b/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/HisTask.java
index 69b4db7..ada39c0 100644
--- a/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/HisTask.java
+++ b/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/HisTask.java
@@ -1,7 +1,7 @@
 package com.qs.serve.task;
 
-import com.qs.serve.common.framework.redis.RedisService;
-import com.qs.serve.common.model.consts.RedisCacheKeys;
+import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.framework.base.model.consts.RedisCacheKeys;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
 import com.qs.serve.modules.his.service.HisUserSupplierTempService;
 import lombok.AllArgsConstructor;
diff --git a/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/PayTask.java b/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/PayTask.java
index 7419d2f..bc2c37c 100644
--- a/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/PayTask.java
+++ b/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/PayTask.java
@@ -1,10 +1,10 @@
 package com.qs.serve.task;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.config.properties.ProjectApisProperties;
-import com.qs.serve.common.model.AmountDTO;
+import com.qs.serve.framework.base.config.properties.ProjectApisProperties;
+import com.qs.serve.framework.base.model.AmountDTO;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.HttpUtil;
+import com.qs.serve.framework.base.util.HttpUtil;
 import com.qs.serve.modules.pay.mapper.PayPaymentItemMapper;
 import com.qs.serve.modules.pay.mapper.PayPaymentMapper;
 import com.qs.serve.modules.tbs.entity.TbsCostApply;
diff --git a/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/HistTestController.java b/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/HistTestController.java
index 7917670..dd5f7cb 100644
--- a/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/HistTestController.java
+++ b/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/HistTestController.java
@@ -1,25 +1,18 @@
 package com.qs.serve.task.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.config.DevEnvironmentConfig;
-import com.qs.serve.common.framework.redis.RedisService;
-import com.qs.serve.common.model.consts.RedisCacheKeys;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.framework.base.config.DevEnvironmentConfig;
+import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.framework.base.model.consts.RedisCacheKeys;
+import com.qs.serve.framework.base.model.R;
 import com.qs.serve.modules.his.service.HisUserChannelPointService;
-import com.qs.serve.modules.oms.entity.OmsOrder;
 import com.qs.serve.task.HisTask;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 /**
  * @author YenHex
  * @since 2023/4/17
diff --git a/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskActivityController.java b/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskActivityController.java
index 18bdf86..e3746fe 100644
--- a/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskActivityController.java
+++ b/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskActivityController.java
@@ -1,8 +1,8 @@
 package com.qs.serve.task.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.CollectionUtil;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.util.CollectionUtil;
 import com.qs.serve.modules.seeyon.service.impl.SeeYonRequestBaseService;
 import com.qs.serve.modules.tbs.common.TbsActivityState;
 import com.qs.serve.modules.tbs.common.TbsSeeYonConst;
diff --git a/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskPayController.java b/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskPayController.java
index 31b6045..4019f58 100644
--- a/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskPayController.java
+++ b/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskPayController.java
@@ -1,6 +1,6 @@
 package com.qs.serve.task.controller;
 
-import com.qs.serve.common.model.dto.R;
+import com.qs.serve.framework.base.model.R;
 import com.qs.serve.modules.pay.service.impl.PayApplicationService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
diff --git a/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskPolicyController.java b/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskPolicyController.java
index 3807224..4674c9c 100644
--- a/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskPolicyController.java
+++ b/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskPolicyController.java
@@ -1,6 +1,6 @@
 package com.qs.serve.task.controller;
 
-import com.qs.serve.common.model.dto.R;
+import com.qs.serve.framework.base.model.R;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
diff --git a/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskSupplierController.java b/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskSupplierController.java
index c196ac0..aab9782 100644
--- a/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskSupplierController.java
+++ b/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskSupplierController.java
@@ -1,8 +1,8 @@
 package com.qs.serve.task.controller;
 
-import com.qs.serve.common.framework.redis.RedisService;
-import com.qs.serve.common.model.consts.RedisCacheKeys;
-import com.qs.serve.common.model.dto.R;
+import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.framework.base.model.consts.RedisCacheKeys;
+import com.qs.serve.framework.base.model.R;
 import com.qs.serve.modules.his.service.HisUserSupplierTempService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
diff --git a/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskUserController.java b/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskUserController.java
index 55f13b1..1f82d16 100644
--- a/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskUserController.java
+++ b/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskUserController.java
@@ -1,8 +1,8 @@
 package com.qs.serve.task.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.JsonUtil;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.util.JsonUtil;
 import com.qs.serve.modules.bms.mapper.BmsSupplierMapper;
 import com.qs.serve.modules.his.service.HisUserSupplierService;
 import com.qs.serve.modules.seeyon.service.impl.SeeYonRequestBaseService;
diff --git a/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskWechatController.java b/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskWechatController.java
index dc14cc7..ce0bef0 100644
--- a/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskWechatController.java
+++ b/cms-api/cms-admin-svc/src/main/java/com/qs/serve/task/controller/TaskWechatController.java
@@ -1,6 +1,6 @@
 package com.qs.serve.task.controller;
 
-import com.qs.serve.common.model.dto.R;
+import com.qs.serve.framework.base.model.R;
 import com.qs.serve.modules.wx.service.WxUserService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
diff --git a/cms-api/cms-policy-svc/pom.xml b/cms-api/cms-policy-svc/pom.xml
index c03e9ad..e151a51 100644
--- a/cms-api/cms-policy-svc/pom.xml
+++ b/cms-api/cms-policy-svc/pom.xml
@@ -16,4 +16,17 @@
         <maven.compiler.target>8</maven.compiler.target>
     </properties>
 
+    <dependencies>
+        <dependency>
+            <groupId>com.qs</groupId>
+            <artifactId>cms-framework-mybatis-plus</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.qs</groupId>
+            <artifactId>cms-policy-bus</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
 </project>
diff --git a/cms-api/cms-policy-svc/src/main/java/com/qs/serve/PolicyApplication.java b/cms-api/cms-policy-svc/src/main/java/com/qs/serve/PolicyApplication.java
new file mode 100644
index 0000000..5dbde47
--- /dev/null
+++ b/cms-api/cms-policy-svc/src/main/java/com/qs/serve/PolicyApplication.java
@@ -0,0 +1,61 @@
+package com.qs.serve;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.stereotype.Indexed;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+import javax.annotation.PostConstruct;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import java.util.TimeZone;
+
+/**
+ * @author YenHex
+ * @since 2025/4/17
+ */
+@Indexed
+@EnableAsync
+@EnableScheduling
+@EnableTransactionManagement
+@EnableCaching
+@EnableFeignClients
+@SpringBootApplication
+public class PolicyApplication extends SpringBootServletInitializer {
+
+    public static void main(String[] args){
+        long start = System.currentTimeMillis();
+        SpringApplication.run(PolicyApplication.class,args);
+        long end = System.currentTimeMillis();
+        double diff = (end-start)/1000.0;
+        System.out.println("启动时间："+diff
+                +"\n  ____   _                _                                                           __         _  _ \n" +
+                " / ___| | |_  __ _  _ __ | |_   _   _  _ __    ___  _   _   ___  ___  ___  ___  ___  / _| _   _ | || |\n" +
+                " \\___ \\ | __|/ _` || '__|| __| | | | || '_ \\  / __|| | | | / __|/ __|/ _ \\/ __|/ __|| |_ | | | || || |\n" +
+                "  ___) || |_| (_| || |   | |_  | |_| || |_) | \\__ \\| |_| || (__| (__|  __/\\__ \\\\__ \\|  _|| |_| || ||_|\n" +
+                " |____/  \\__|\\__,_||_|    \\__|  \\__,_|| .__/  |___/ \\__,_| \\___|\\___|\\___||___/|___/|_|   \\__,_||_|(_)\n" +
+                "                                      |_|                             \n");
+    }
+
+    @Override
+    public void onStartup(ServletContext servletContext) throws ServletException {
+        super.onStartup(servletContext);
+    }
+
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
+        return builder.sources(PolicyApplication.class);
+    }
+
+    @PostConstruct
+    void started() {
+        TimeZone.setDefault(TimeZone.getTimeZone("Asia/Shanghai"));
+    }
+
+}
diff --git a/cms-api/cms-policy-svc/src/main/resources/application-dev.yml b/cms-api/cms-policy-svc/src/main/resources/application-dev.yml
new file mode 100644
index 0000000..780783e
--- /dev/null
+++ b/cms-api/cms-policy-svc/src/main/resources/application-dev.yml
@@ -0,0 +1,52 @@
+feign:
+  client:
+    config:
+      default:
+        connectTimeout: 5000     # 连接超时时间
+        readTimeout: 5000        # 读取超时时间
+  httpclient:
+    enabled: true
+# 服务列表
+service-list:
+  policy-svc: http://localhost:8081
+
+#服务配置
+server:
+  port: 7500
+  servlet:
+    context-path: /
+
+#SpringBoot相关
+spring:
+  datasource:
+    dynamic:
+      datasource:
+        master:
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          url: jdbc:mysql://192.168.0.9:3306/jsl_mall_qs_dev?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true
+          username: kpjsl
+          password: 123456
+#SpringBoot相关
+    hikari:
+      #连接池名
+      pool-name: DateHikariCP
+      #最小空闲连接数
+      minimum-idle: 10
+      # 空闲连接存活最大时间，默认600000（10分钟）
+      idle-timeout: 180000
+      # 连接池最大连接数，默认是10
+      maximum-pool-size: 30
+      # 此属性控制从池返回的连接的默认自动提交行为,默认值：true
+      auto-commit: true
+      # 此属性控制池中连接的最长生命周期，值0表示无限生命周期，默认1800000即30分钟
+      max-lifetime: 1800000
+      # 数据库连接超时时间,默认30秒，即30000
+      connection-timeout: 30000
+      connection-test-query: SELECT 1
+      validation-timeout: 1
+      login-timeout: 5
+  redis:
+    database: 1
+    host: 127.0.0.1
+    port: 6379
+    password:
diff --git a/cms-api/cms-policy-svc/src/main/resources/application.yml b/cms-api/cms-policy-svc/src/main/resources/application.yml
new file mode 100644
index 0000000..a9d4c58
--- /dev/null
+++ b/cms-api/cms-policy-svc/src/main/resources/application.yml
@@ -0,0 +1,87 @@
+spring:
+  servlet:
+    multipart:
+      max-file-size: 100MB
+      max-request-size: 160MB
+  profiles:
+    active: dev
+  main:
+    #easypoi启用覆盖
+    allow-bean-definition-overriding: true
+  jmx:
+    enabled: false
+  devtools:
+    restart:
+      enabled: false
+#项目配置
+project:
+  ignore-url:
+    tenants: #忽略租户拦截
+      - /callback
+      - /favicon.ico
+      - /error
+      - /portal/syKeyLogin
+      - /bir/roiRate/test
+      - /static/*
+      - /api/wx/login/getCpSignature
+      - /web/*
+    permits: #忽略登录
+      - /thirty/** #第三方接口
+      - /portal/flushToken #第三方接口
+      - /common/upload #支持API上传调整
+      - /common/validToken #验证token
+      - /sys/attach/listByIds/**
+      - /api/**
+      - /static/**
+      - /web/**
+      - /portal/**
+      - /favicon.ico
+      - /error
+      - /callback
+      - /bir/roiRate/test
+
+#mybatis plus
+mybatis-plus:
+  mapper-locations: classpath:mapper/*/*.xml
+  type-aliases-package: com.qs.serve.modules.*.entity.*
+  configuration:
+    map-underscore-to-camel-case: true
+    #log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
+  global-config:
+    banner: false
+    db-config:
+      logic-delete-value: 1
+      logic-not-delete-value: 0
+      select-strategy: not_empty
+      logic-delete-field: delFlag
+# 日志配置
+logging:
+  level:
+    ROOT: debug
+    com.qs.serve: debug
+    com.qs.serve.modules.his: debug
+    com.qs.serve.modules.sys: debug
+    com.qs.serve.modules.tag: info
+    org.xnio.nio: info
+    org.springframework: info
+    com.baomidou: info
+    org.mybatis: info
+    org.hibernate.validator: info
+    druid.sql.ResultSet: info
+    druid.sql.Connection: info
+    com.zaxxer.hikari.pool: info
+    com.zaxxer.hikari.HikariConfig: info
+    com.qs.serve.modules.sys.mapper.SysOperationLogMapper: info
+    java.io: warn
+    io.netty: info
+    io.undertow: info
+    io.lettuce.core: info
+  config: classpath:log4j2.xml
+# PageHelper分页插件
+pagehelper:
+  reasonable: false
+  #helper-dialect: sqlserver
+  autoRuntimeDialect: true
+  supportMethodsArguments: true
+  params: count=countSql
+
diff --git a/cms-api/cms-policy-svc/src/main/resources/banner.txt b/cms-api/cms-policy-svc/src/main/resources/banner.txt
new file mode 100644
index 0000000..09bf7ff
--- /dev/null
+++ b/cms-api/cms-policy-svc/src/main/resources/banner.txt
@@ -0,0 +1,4 @@
+${AnsiBackground.BLACK}
+-- ----------------------------
+-- 嘉士利CRM系统 by.柒胜
+-- ----------------------------
diff --git a/cms-api/cms-policy-svc/src/main/resources/log4j2.xml b/cms-api/cms-policy-svc/src/main/resources/log4j2.xml
new file mode 100644
index 0000000..f7d1bce
--- /dev/null
+++ b/cms-api/cms-policy-svc/src/main/resources/log4j2.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Configuration后面的status，这个用于设置log4j2自身内部的信息输出，可以不设置，当设置成trace时，你会看到log4j2内部各种详细输出-->
+<!--monitorInterval：Log4j能够自动检测修改配置 文件和重新配置本身，设置间隔秒数-->
+<configuration monitorInterval="5">
+    <!--日志级别以及优先级排序: OFF > FATAL > ERROR > WARN > INFO > DEBUG > TRACE > ALL -->
+
+    <!--变量配置-->
+    <Properties>
+        <property name="LOG_PATTERN" value="%d %highlight{%-5level}{ERROR=Bright RED, WARN=Bright Yellow, INFO=Bright Green, DEBUG=Bright Cyan, TRACE=Bright White} %style{[%t]}{bright,magenta} %style{%c{1.}.%M(%L)}{cyan}: %msg%n" />
+        <property name="FILE_PATH" value="home/logs" />
+    </Properties>
+
+    <appenders>
+		<!-- console -->
+        <console name="Console" target="SYSTEM_OUT">
+            <PatternLayout pattern="${LOG_PATTERN}"/>
+            <ThresholdFilter level="all" onMatch="ACCEPT" onMismatch="DENY"/>
+        </console>
+
+        <File name="FileLog" fileName="${FILE_PATH}/test.log" append="false" filePattern="${FILE_PATH}/test-%d{yyyy-MM-dd}_%i.log.gz">
+            <PatternLayout pattern="${LOG_PATTERN}"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy interval="1"/>
+                <SizeBasedTriggeringPolicy size="10MB"/>
+            </Policies>
+            <DefaultRolloverStrategy max="15"/>
+        </File>
+
+        <!-- debug -->
+        <RollingFile name="RollingFileDebug" fileName="${FILE_PATH}/debug.log" filePattern="${FILE_PATH}/debug-%d{yyyy-MM-dd}_%i.log.gz">
+            <ThresholdFilter level="all" onMatch="ACCEPT" onMismatch="DENY"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy interval="1"/>
+                <SizeBasedTriggeringPolicy size="10MB"/>
+            </Policies>
+            <DefaultRolloverStrategy max="15"/>
+        </RollingFile>
+
+		<!-- info -->
+        <RollingFile name="RollingFileInfo" fileName="${FILE_PATH}/info.log" filePattern="${FILE_PATH}/info-%d{yyyy-MM-dd}_%i.log.gz">
+            <ThresholdFilter level="info" onMatch="ACCEPT" onMismatch="DENY"/>
+            <PatternLayout pattern="${LOG_PATTERN}"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy interval="1"/>
+                <SizeBasedTriggeringPolicy size="10MB"/>
+            </Policies>
+            <DefaultRolloverStrategy max="15"/>
+        </RollingFile>
+		<!-- warn -->
+        <RollingFile name="RollingFileWarn" fileName="${FILE_PATH}/warn.log" filePattern="${FILE_PATH}/warn-%d{yyyy-MM-dd}_%i.log.gz">
+            <ThresholdFilter level="warn" onMatch="ACCEPT" onMismatch="DENY"/>
+            <PatternLayout pattern="${LOG_PATTERN}"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy interval="1"/>
+                <SizeBasedTriggeringPolicy size="10MB"/>
+            </Policies>
+            <DefaultRolloverStrategy max="15"/>
+        </RollingFile>
+		<!-- error -->
+        <RollingFile name="RollingFileError" fileName="${FILE_PATH}/error.log" filePattern="${FILE_PATH}/error-%d{yyyy-MM-dd}_%i.log.gz">
+            <ThresholdFilter level="error" onMatch="ACCEPT" onMismatch="DENY"/>
+            <PatternLayout pattern="${LOG_PATTERN}"/>
+            <Policies>
+                <TimeBasedTriggeringPolicy interval="1"/>
+                <SizeBasedTriggeringPolicy size="10MB"/>
+            </Policies>
+            <DefaultRolloverStrategy max="15"/>
+        </RollingFile>
+
+    </appenders>
+
+    <loggers>
+        <root level="debug">
+            <appender-ref ref="Console"/>
+            <appender-ref ref="FileLog"/>
+            <appender-ref ref="RollingFileDebug"/>
+            <appender-ref ref="RollingFileInfo"/>
+            <appender-ref ref="RollingFileWarn"/>
+            <appender-ref ref="RollingFileError"/>
+        </root>
+    </loggers>
+
+</configuration>
diff --git a/cms-common/pom.xml b/cms-common/pom.xml
index 068b10d..058287d 100644
--- a/cms-common/pom.xml
+++ b/cms-common/pom.xml
@@ -23,6 +23,60 @@
             <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-undertow</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+            <version>1.4.4</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis-spring</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter</artifactId>-->
+<!--            <exclusions>-->
+<!--                <exclusion>-->
+<!--                    <groupId>org.springframework.boot</groupId>-->
+<!--                    <artifactId>spring-boot-starter-logging</artifactId>-->
+<!--                </exclusion>-->
+<!--            </exclusions>-->
+<!--        </dependency>-->
+
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-web</artifactId>-->
+<!--            <exclusions>-->
+<!--                <exclusion>-->
+<!--                    <groupId>org.springframework.boot</groupId>-->
+<!--                    <artifactId>spring-boot-starter-tomcat</artifactId>-->
+<!--                </exclusion>-->
+<!--            </exclusions>-->
+<!--        </dependency>-->
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/annotation/BusinessDifference.java b/cms-common/src/main/java/com/qs/serve/common/annotation/BusinessDifference.java
similarity index 85%
rename from cms-framework/src/main/java/com/qs/serve/common/model/annotation/BusinessDifference.java
rename to cms-common/src/main/java/com/qs/serve/common/annotation/BusinessDifference.java
index 394d592..c4af6bd 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/annotation/BusinessDifference.java
+++ b/cms-common/src/main/java/com/qs/serve/common/annotation/BusinessDifference.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.model.annotation;
+package com.qs.serve.common.annotation;
 
 import java.lang.annotation.*;
 
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/annotation/LimitSubmit.java b/cms-common/src/main/java/com/qs/serve/common/annotation/LimitSubmit.java
similarity index 90%
rename from cms-framework/src/main/java/com/qs/serve/common/model/annotation/LimitSubmit.java
rename to cms-common/src/main/java/com/qs/serve/common/annotation/LimitSubmit.java
index 8ec4ce5..c167491 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/annotation/LimitSubmit.java
+++ b/cms-common/src/main/java/com/qs/serve/common/annotation/LimitSubmit.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.model.annotation;
+package com.qs.serve.common.annotation;
 
 import java.lang.annotation.*;
 
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/annotation/RepeatSubmit.java b/cms-common/src/main/java/com/qs/serve/common/annotation/RepeatSubmit.java
similarity index 87%
rename from cms-framework/src/main/java/com/qs/serve/common/model/annotation/RepeatSubmit.java
rename to cms-common/src/main/java/com/qs/serve/common/annotation/RepeatSubmit.java
index 5bd1eba..bd17c54 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/annotation/RepeatSubmit.java
+++ b/cms-common/src/main/java/com/qs/serve/common/annotation/RepeatSubmit.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.model.annotation;
+package com.qs.serve.common.annotation;
 
 /**
  * 防止表单重复提交
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/annotation/SysLog.java b/cms-common/src/main/java/com/qs/serve/common/annotation/SysLog.java
similarity index 74%
rename from cms-framework/src/main/java/com/qs/serve/common/model/annotation/SysLog.java
rename to cms-common/src/main/java/com/qs/serve/common/annotation/SysLog.java
index cb30b55..a04cc05 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/annotation/SysLog.java
+++ b/cms-common/src/main/java/com/qs/serve/common/annotation/SysLog.java
@@ -1,8 +1,8 @@
-package com.qs.serve.common.model.annotation;
+package com.qs.serve.common.annotation;
 
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.InterType;
-import com.qs.serve.common.model.enums.SystemModule;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.InterType;
+import com.qs.serve.common.enums.SystemModule;
 
 import java.lang.annotation.*;
 
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/enums/BizType.java b/cms-common/src/main/java/com/qs/serve/common/enums/BizType.java
similarity index 94%
rename from cms-framework/src/main/java/com/qs/serve/common/model/enums/BizType.java
rename to cms-common/src/main/java/com/qs/serve/common/enums/BizType.java
index deb1dda..279be28 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/enums/BizType.java
+++ b/cms-common/src/main/java/com/qs/serve/common/enums/BizType.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.model.enums;
+package com.qs.serve.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/enums/BudgetLogOptFlag.java b/cms-common/src/main/java/com/qs/serve/common/enums/BudgetLogOptFlag.java
similarity index 98%
rename from cms-framework/src/main/java/com/qs/serve/common/model/enums/BudgetLogOptFlag.java
rename to cms-common/src/main/java/com/qs/serve/common/enums/BudgetLogOptFlag.java
index 8360b9c..cd69667 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/enums/BudgetLogOptFlag.java
+++ b/cms-common/src/main/java/com/qs/serve/common/enums/BudgetLogOptFlag.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.model.enums;
+package com.qs.serve.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/enums/ExcelFilePath.java b/cms-common/src/main/java/com/qs/serve/common/enums/ExcelFilePath.java
similarity index 84%
rename from cms-framework/src/main/java/com/qs/serve/common/model/enums/ExcelFilePath.java
rename to cms-common/src/main/java/com/qs/serve/common/enums/ExcelFilePath.java
index 982e41f..98ece9d 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/enums/ExcelFilePath.java
+++ b/cms-common/src/main/java/com/qs/serve/common/enums/ExcelFilePath.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.model.enums;
+package com.qs.serve.common.enums;
 
 import lombok.AllArgsConstructor;
 
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/enums/HttpCode.java b/cms-common/src/main/java/com/qs/serve/common/enums/HttpCode.java
similarity index 96%
rename from cms-framework/src/main/java/com/qs/serve/common/model/enums/HttpCode.java
rename to cms-common/src/main/java/com/qs/serve/common/enums/HttpCode.java
index 18c2e61..da84f65 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/enums/HttpCode.java
+++ b/cms-common/src/main/java/com/qs/serve/common/enums/HttpCode.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.model.enums;
+package com.qs.serve.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/enums/InterType.java b/cms-common/src/main/java/com/qs/serve/common/enums/InterType.java
similarity index 80%
rename from cms-framework/src/main/java/com/qs/serve/common/model/enums/InterType.java
rename to cms-common/src/main/java/com/qs/serve/common/enums/InterType.java
index daf5495..0e2959c 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/enums/InterType.java
+++ b/cms-common/src/main/java/com/qs/serve/common/enums/InterType.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.model.enums;
+package com.qs.serve.common.enums;
 
 /**
  * @author YenHex
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/enums/MonthValues.java b/cms-common/src/main/java/com/qs/serve/common/enums/MonthValues.java
similarity index 95%
rename from cms-framework/src/main/java/com/qs/serve/common/model/enums/MonthValues.java
rename to cms-common/src/main/java/com/qs/serve/common/enums/MonthValues.java
index 22ac159..f2136fe 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/enums/MonthValues.java
+++ b/cms-common/src/main/java/com/qs/serve/common/enums/MonthValues.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.model.enums;
+package com.qs.serve.common.enums;
 
 /**
  * @author YenHex
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/enums/PolicyType.java b/cms-common/src/main/java/com/qs/serve/common/enums/PolicyType.java
similarity index 90%
rename from cms-framework/src/main/java/com/qs/serve/common/model/enums/PolicyType.java
rename to cms-common/src/main/java/com/qs/serve/common/enums/PolicyType.java
index d1a26a9..3e4eb90 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/enums/PolicyType.java
+++ b/cms-common/src/main/java/com/qs/serve/common/enums/PolicyType.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.model.enums;
+package com.qs.serve.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/enums/SystemModule.java b/cms-common/src/main/java/com/qs/serve/common/enums/SystemModule.java
similarity index 94%
rename from cms-framework/src/main/java/com/qs/serve/common/model/enums/SystemModule.java
rename to cms-common/src/main/java/com/qs/serve/common/enums/SystemModule.java
index a348f1e..82e0184 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/enums/SystemModule.java
+++ b/cms-common/src/main/java/com/qs/serve/common/enums/SystemModule.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.model.enums;
+package com.qs.serve.common.enums;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/util/Assert.java b/cms-common/src/main/java/com/qs/serve/common/exception/Assert.java
similarity index 76%
rename from cms-framework/src/main/java/com/qs/serve/common/util/Assert.java
rename to cms-common/src/main/java/com/qs/serve/common/exception/Assert.java
index d1f440b..4177e0d 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/util/Assert.java
+++ b/cms-common/src/main/java/com/qs/serve/common/exception/Assert.java
@@ -1,8 +1,8 @@
-package com.qs.serve.common.util;
+package com.qs.serve.common.exception;
 
 
-import com.qs.serve.common.framework.exception.BusinessException;
-import com.qs.serve.common.model.enums.HttpCode;
+import com.qs.serve.common.exception.BusinessException;
+import com.qs.serve.common.enums.HttpCode;
 import lombok.experimental.UtilityClass;
 
 /**
diff --git a/cms-framework/src/main/java/com/qs/serve/common/framework/exception/BaseException.java b/cms-common/src/main/java/com/qs/serve/common/exception/BaseException.java
similarity index 85%
rename from cms-framework/src/main/java/com/qs/serve/common/framework/exception/BaseException.java
rename to cms-common/src/main/java/com/qs/serve/common/exception/BaseException.java
index 07d0353..0774f87 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/framework/exception/BaseException.java
+++ b/cms-common/src/main/java/com/qs/serve/common/exception/BaseException.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.framework.exception;
+package com.qs.serve.common.exception;
 
 /**
  * @author JcYen
diff --git a/cms-framework/src/main/java/com/qs/serve/common/framework/exception/BusinessException.java b/cms-common/src/main/java/com/qs/serve/common/exception/BusinessException.java
similarity index 90%
rename from cms-framework/src/main/java/com/qs/serve/common/framework/exception/BusinessException.java
rename to cms-common/src/main/java/com/qs/serve/common/exception/BusinessException.java
index 6679aca..0b22982 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/framework/exception/BusinessException.java
+++ b/cms-common/src/main/java/com/qs/serve/common/exception/BusinessException.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.framework.exception;
+package com.qs.serve.common.exception;
 
 import java.io.Serializable;
 
diff --git a/cms-framework/src/main/java/com/qs/serve/common/framework/exception/UnifiedExceptionHandler.java b/cms-common/src/main/java/com/qs/serve/common/exception/UnifiedExceptionHandler.java
similarity index 75%
rename from cms-framework/src/main/java/com/qs/serve/common/framework/exception/UnifiedExceptionHandler.java
rename to cms-common/src/main/java/com/qs/serve/common/exception/UnifiedExceptionHandler.java
index f463aa8..34a9f34 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/framework/exception/UnifiedExceptionHandler.java
+++ b/cms-common/src/main/java/com/qs/serve/common/exception/UnifiedExceptionHandler.java
@@ -1,15 +1,14 @@
-package com.qs.serve.common.framework.exception;
+package com.qs.serve.common.exception;
 
-import com.qs.serve.common.config.DevEnvironmentConfig;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.HttpCode;
+import com.qs.serve.framework.base.model.R;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.http.converter.HttpMessageNotReadableException;
 import org.springframework.http.converter.HttpMessageNotWritableException;
-import org.springframework.security.access.AccessDeniedException;
-import org.springframework.security.authentication.BadCredentialsException;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
+//import com.qs.serve.common.enums.HttpCode;
+//import org.springframework.security.access.AccessDeniedException;
+//import org.springframework.security.authentication.BadCredentialsException;
+//import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.BindException;
 import org.springframework.web.HttpRequestMethodNotSupportedException;
@@ -54,33 +53,33 @@ public class UnifiedExceptionHandler {
         return R.error("数据不存在或被移除");
     }
 
-    @ExceptionHandler({
-            AccessDeniedException.class
-    })
-    @ResponseBody
-    public R handleAccessException(AccessDeniedException e,HttpServletRequest request) {
-        HttpCode hc = HttpCode.FORBIDDEN_403;
-        log.error("访问拦截【{}】，请求地址：{}",e.getMessage(),request.getRequestURI());
-        return new R(hc.getCode(),hc.getMsg());
-    }
-
-    @ExceptionHandler({
-            UsernameNotFoundException.class,
-    })
-    @ResponseBody
-    public R handlePrintMsgException(UsernameNotFoundException e) {
-        return R.error();
-    }
-
-    @ExceptionHandler({
-            BadCredentialsException.class,
-    })
-    @ResponseBody
-    public R handlePrintMsgException(Exception e) {
-        log.warn(e.getMessage());
-        HttpCode hc = HttpCode.LOGIN_ERR_1;
-        return new R(hc.getCode(),hc.getMsg());
-    }
+//    @ExceptionHandler({
+//            AccessDeniedException.class
+//    })
+//    @ResponseBody
+//    public R handleAccessException(AccessDeniedException e,HttpServletRequest request) {
+//        HttpCode hc = HttpCode.FORBIDDEN_403;
+//        log.error("访问拦截【{}】，请求地址：{}",e.getMessage(),request.getRequestURI());
+//        return new R(hc.getCode(),hc.getMsg());
+//    }
+//
+//    @ExceptionHandler({
+//            UsernameNotFoundException.class,
+//    })
+//    @ResponseBody
+//    public R handlePrintMsgException(UsernameNotFoundException e) {
+//        return R.error();
+//    }
+//
+//    @ExceptionHandler({
+//            BadCredentialsException.class,
+//    })
+//    @ResponseBody
+//    public R handlePrintMsgException(Exception e) {
+//        log.warn(e.getMessage());
+//        HttpCode hc = HttpCode.LOGIN_ERR_1;
+//        return new R(hc.getCode(),hc.getMsg());
+//    }
 
     @ExceptionHandler({
         BindException.class,
@@ -89,9 +88,6 @@ public class UnifiedExceptionHandler {
     @ResponseBody
     public R handleDevPrintMsgException(Exception e,HttpServletRequest request) {
         log.error("参数校验异常：{}",e.getMessage());
-        if(DevEnvironmentConfig.isDev()){
-            return R.error(e.getMessage());
-        }
         return R.error();
     }
 
@@ -146,7 +142,6 @@ public class UnifiedExceptionHandler {
     public R handleException(Exception e,HttpServletRequest request) {
         log.error("Servlet异常\n请求地址：{},异常类型：{}\n异常信息：{}\n异常体：",request.getRequestURI(),e.getClass().getSimpleName(),e.getMessage(),e);
         e.printStackTrace();
-        if(DevEnvironmentConfig.isDev()){return R.error(e.getMessage());}
         return R.error();
     }
 
diff --git a/cms-framework/src/main/java/com/qs/serve/common/util/CopierUtil.java b/cms-common/src/main/java/com/qs/serve/common/utils/CopierUtil.java
similarity index 98%
rename from cms-framework/src/main/java/com/qs/serve/common/util/CopierUtil.java
rename to cms-common/src/main/java/com/qs/serve/common/utils/CopierUtil.java
index a79c226..c67407b 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/util/CopierUtil.java
+++ b/cms-common/src/main/java/com/qs/serve/common/utils/CopierUtil.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.util;
+package com.qs.serve.common.utils;
 
 import lombok.experimental.UtilityClass;
 import org.springframework.cglib.beans.BeanCopier;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/util/PageUtil.java b/cms-common/src/main/java/com/qs/serve/common/utils/PageUtil.java
similarity index 98%
rename from cms-framework/src/main/java/com/qs/serve/common/util/PageUtil.java
rename to cms-common/src/main/java/com/qs/serve/common/utils/PageUtil.java
index 63d725b..e18501a 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/util/PageUtil.java
+++ b/cms-common/src/main/java/com/qs/serve/common/utils/PageUtil.java
@@ -1,9 +1,9 @@
-package com.qs.serve.common.util;
+package com.qs.serve.common.utils;
 
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
-import com.qs.serve.common.framework.exception.BusinessException;
+import com.qs.serve.common.exception.BusinessException;
 import lombok.experimental.UtilityClass;
 
 import java.util.ArrayList;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/util/ServletUtils.java b/cms-common/src/main/java/com/qs/serve/common/utils/ServletUtils.java
similarity index 95%
rename from cms-framework/src/main/java/com/qs/serve/common/util/ServletUtils.java
rename to cms-common/src/main/java/com/qs/serve/common/utils/ServletUtils.java
index d1f4abb..53ecdcf 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/util/ServletUtils.java
+++ b/cms-common/src/main/java/com/qs/serve/common/utils/ServletUtils.java
@@ -1,6 +1,5 @@
-package com.qs.serve.common.util;
+package com.qs.serve.common.utils;
 
-import com.qs.serve.common.model.consts.GySysConst;
 import lombok.experimental.UtilityClass;
 import org.springframework.http.MediaType;
 import org.springframework.web.context.request.RequestAttributes;
@@ -23,6 +22,10 @@ import java.nio.charset.StandardCharsets;
  **/
 @UtilityClass
 public class ServletUtils {
+
+    /** 后台身份验证 */
+    public static final String AUTHORIZATION_PROP = "Authorization";
+
     /**
      * 获取String参数
      */
@@ -32,7 +35,7 @@ public class ServletUtils {
 
     public static String getAuthToken(){
         HttpServletRequest request = getRequest();
-        return request.getHeader(GySysConst.AUTHORIZATION_PROP);
+        return request.getHeader(AUTHORIZATION_PROP);
     }
 
     /**
diff --git a/cms-framework/src/main/java/com/qs/serve/common/util/StringUtils.java b/cms-common/src/main/java/com/qs/serve/common/utils/StringUtils.java
similarity index 99%
rename from cms-framework/src/main/java/com/qs/serve/common/util/StringUtils.java
rename to cms-common/src/main/java/com/qs/serve/common/utils/StringUtils.java
index 234b21a..a2a4db0 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/util/StringUtils.java
+++ b/cms-common/src/main/java/com/qs/serve/common/utils/StringUtils.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.util;
+package com.qs.serve.common.utils;
 
 import lombok.experimental.UtilityClass;
 
diff --git a/cms-framework/src/main/java/com/qs/serve/common/util/TreeUtil.java b/cms-common/src/main/java/com/qs/serve/common/utils/TreeUtil.java
similarity index 95%
rename from cms-framework/src/main/java/com/qs/serve/common/util/TreeUtil.java
rename to cms-common/src/main/java/com/qs/serve/common/utils/TreeUtil.java
index 2053ac8..ee40f4a 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/util/TreeUtil.java
+++ b/cms-common/src/main/java/com/qs/serve/common/utils/TreeUtil.java
@@ -1,6 +1,6 @@
-package com.qs.serve.common.util;
+package com.qs.serve.common.utils;
 
-import com.qs.serve.common.model.dto.TreeNode;
+import com.qs.serve.framework.base.model.TreeNode;
 import lombok.experimental.UtilityClass;
 
 import java.util.ArrayList;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/util/WordUtil.java b/cms-common/src/main/java/com/qs/serve/common/utils/WordUtil.java
similarity index 97%
rename from cms-framework/src/main/java/com/qs/serve/common/util/WordUtil.java
rename to cms-common/src/main/java/com/qs/serve/common/utils/WordUtil.java
index 2396956..4cfb2ce 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/util/WordUtil.java
+++ b/cms-common/src/main/java/com/qs/serve/common/utils/WordUtil.java
@@ -1,5 +1,6 @@
-package com.qs.serve.common.util;
+package com.qs.serve.common.utils;
 
+import com.qs.serve.common.utils.StringUtils;
 import lombok.experimental.UtilityClass;
 
 /**
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/dto/PageVo.java b/cms-common/src/main/java/com/qs/serve/framework/base/model/PageVo.java
similarity index 92%
rename from cms-framework/src/main/java/com/qs/serve/common/model/dto/PageVo.java
rename to cms-common/src/main/java/com/qs/serve/framework/base/model/PageVo.java
index c06af13..3e3bfa0 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/dto/PageVo.java
+++ b/cms-common/src/main/java/com/qs/serve/framework/base/model/PageVo.java
@@ -1,6 +1,6 @@
-package com.qs.serve.common.model.dto;
+package com.qs.serve.framework.base.model;
 
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.common.utils.PageUtil;
 import lombok.Getter;
 import lombok.Setter;
 
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/dto/R.java b/cms-common/src/main/java/com/qs/serve/framework/base/model/R.java
similarity index 98%
rename from cms-framework/src/main/java/com/qs/serve/common/model/dto/R.java
rename to cms-common/src/main/java/com/qs/serve/framework/base/model/R.java
index bf6f27b..ff144c2 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/dto/R.java
+++ b/cms-common/src/main/java/com/qs/serve/framework/base/model/R.java
@@ -1,8 +1,8 @@
-package com.qs.serve.common.model.dto;
+package com.qs.serve.framework.base.model;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.pagehelper.PageInfo;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.common.utils.PageUtil;
 import lombok.Getter;
 import lombok.Setter;
 
diff --git a/cms-common/src/main/java/com/qs/serve/framework/base/model/ResultFlag.java b/cms-common/src/main/java/com/qs/serve/framework/base/model/ResultFlag.java
new file mode 100644
index 0000000..330c752
--- /dev/null
+++ b/cms-common/src/main/java/com/qs/serve/framework/base/model/ResultFlag.java
@@ -0,0 +1,19 @@
+package com.qs.serve.framework.base.model;
+
+/**
+ * @author YenHex
+ * @since 2023/2/15
+ */
+public interface ResultFlag {
+
+    int OK = 1;
+    int NOT = 0;
+
+    static boolean isTrue(Integer flag) {
+        if (flag!=null && flag.equals(OK)){
+            return true;
+        }
+        return false;
+    }
+
+}
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/dto/TreeNode.java b/cms-common/src/main/java/com/qs/serve/framework/base/model/TreeNode.java
similarity index 93%
rename from cms-framework/src/main/java/com/qs/serve/common/model/dto/TreeNode.java
rename to cms-common/src/main/java/com/qs/serve/framework/base/model/TreeNode.java
index cb4f4cc..80923b5 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/dto/TreeNode.java
+++ b/cms-common/src/main/java/com/qs/serve/framework/base/model/TreeNode.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.model.dto;
+package com.qs.serve.framework.base.model;
 
 import lombok.Data;
 
diff --git a/cms-framework/cms-framework-base/pom.xml b/cms-framework/cms-framework-base/pom.xml
new file mode 100644
index 0000000..b4b1a2a
--- /dev/null
+++ b/cms-framework/cms-framework-base/pom.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>cms-framework</artifactId>
+        <groupId>com.qs</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>cms-framework-base</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>com.qs</groupId>
+            <artifactId>cms-common</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-undertow</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-log4j2</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>4.10.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>easyexcel</artifactId>
+            <version>3.3.2</version>
+        </dependency>
+
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>${hutool.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.auth0</groupId>
+            <artifactId>java-jwt</artifactId>
+            <version>${jwt.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.15</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.microsoft.sqlserver</groupId>
+            <artifactId>mssql-jdbc</artifactId>
+            <version>8.4.1.jre8</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.12.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>weixin-java-mp</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>weixin-java-cp</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.tencentcloudapi</groupId>
+            <artifactId>tencentcloud-sdk-java</artifactId>
+            <version>3.1.598</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.shalousun</groupId>
+            <artifactId>smart-doc</artifactId>
+            <version>2.4.0</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+            <version>3.16.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+            <version>2.10</version>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/cms-framework/src/main/java/com/qs/serve/common/config/CustomServletContextInitializer.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/CustomServletContextInitializer.java
similarity index 93%
rename from cms-framework/src/main/java/com/qs/serve/common/config/CustomServletContextInitializer.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/CustomServletContextInitializer.java
index 26c2074..6c50aca 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/config/CustomServletContextInitializer.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/CustomServletContextInitializer.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.config;
+package com.qs.serve.framework.base.config;
 
 import org.springframework.boot.web.servlet.ServletContextInitializer;
 import org.springframework.context.annotation.Configuration;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/config/DevEnvironmentConfig.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/DevEnvironmentConfig.java
similarity index 87%
rename from cms-framework/src/main/java/com/qs/serve/common/config/DevEnvironmentConfig.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/DevEnvironmentConfig.java
index 172699e..518e7af 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/config/DevEnvironmentConfig.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/DevEnvironmentConfig.java
@@ -1,6 +1,6 @@
-package com.qs.serve.common.config;
+package com.qs.serve.framework.base.config;
 
-import com.qs.serve.common.util.Assert;
+import com.qs.serve.common.exception.Assert;
 import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
 
diff --git a/cms-framework/src/main/java/com/qs/serve/common/config/JwtConfig.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/JwtConfig.java
similarity index 88%
rename from cms-framework/src/main/java/com/qs/serve/common/config/JwtConfig.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/JwtConfig.java
index 295c10d..3dce21c 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/config/JwtConfig.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/JwtConfig.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.config;
+package com.qs.serve.framework.base.config;
 
 
 import lombok.Getter;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/config/RedisConfig.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/RedisConfig.java
similarity index 98%
rename from cms-framework/src/main/java/com/qs/serve/common/config/RedisConfig.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/RedisConfig.java
index cc4922f..7a13989 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/config/RedisConfig.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/RedisConfig.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.config;
+package com.qs.serve.framework.base.config;
 
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/config/SpringMvcConfig.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/SpringMvcConfig.java
similarity index 93%
rename from cms-framework/src/main/java/com/qs/serve/common/config/SpringMvcConfig.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/SpringMvcConfig.java
index 9cded5e..0589b29 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/config/SpringMvcConfig.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/SpringMvcConfig.java
@@ -1,7 +1,7 @@
-package com.qs.serve.common.config;
+package com.qs.serve.framework.base.config;
 
-import com.qs.serve.common.config.properties.ProjectProperties;
-import com.qs.serve.common.framework.interceptor.LimitSubmitInterceptor;
+import com.qs.serve.framework.base.config.properties.ProjectProperties;
+import com.qs.serve.framework.base.framework.interceptor.LimitSubmitInterceptor;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Bean;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/config/ThreadPoolConfig.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/ThreadPoolConfig.java
similarity index 95%
rename from cms-framework/src/main/java/com/qs/serve/common/config/ThreadPoolConfig.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/ThreadPoolConfig.java
index f1128d5..cea2c07 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/config/ThreadPoolConfig.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/ThreadPoolConfig.java
@@ -1,6 +1,6 @@
-package com.qs.serve.common.config;
+package com.qs.serve.framework.base.config;
 
-import com.qs.serve.common.util.ThreadsUtils;
+import com.qs.serve.framework.base.util.ThreadsUtils;
 import org.apache.commons.lang3.concurrent.BasicThreadFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/config/properties/AliYunOssProperties.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/AliYunOssProperties.java
similarity index 90%
rename from cms-framework/src/main/java/com/qs/serve/common/config/properties/AliYunOssProperties.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/AliYunOssProperties.java
index fd69d18..87ffdc5 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/config/properties/AliYunOssProperties.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/AliYunOssProperties.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.config.properties;
+package com.qs.serve.framework.base.config.properties;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/config/properties/AuthUrlConst.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/AuthUrlConst.java
similarity index 75%
rename from cms-framework/src/main/java/com/qs/serve/common/config/properties/AuthUrlConst.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/AuthUrlConst.java
index 910aebc..b88fc89 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/config/properties/AuthUrlConst.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/AuthUrlConst.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.config.properties;
+package com.qs.serve.framework.base.config.properties;
 
 /**
  * @author YenHex
diff --git a/cms-framework/src/main/java/com/qs/serve/common/config/properties/PermitProperties.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/PermitProperties.java
similarity index 92%
rename from cms-framework/src/main/java/com/qs/serve/common/config/properties/PermitProperties.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/PermitProperties.java
index c6269b4..59f2cfc 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/config/properties/PermitProperties.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/PermitProperties.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.config.properties;
+package com.qs.serve.framework.base.config.properties;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/config/properties/ProjectApisProperties.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/ProjectApisProperties.java
similarity index 93%
rename from cms-framework/src/main/java/com/qs/serve/common/config/properties/ProjectApisProperties.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/ProjectApisProperties.java
index 8d81797..f4e373d 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/config/properties/ProjectApisProperties.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/ProjectApisProperties.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.config.properties;
+package com.qs.serve.framework.base.config.properties;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/config/properties/ProjectProperties.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/ProjectProperties.java
similarity index 90%
rename from cms-framework/src/main/java/com/qs/serve/common/config/properties/ProjectProperties.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/ProjectProperties.java
index f232a0c..dbdc1a2 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/config/properties/ProjectProperties.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/ProjectProperties.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.config.properties;
+package com.qs.serve.framework.base.config.properties;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/config/properties/QiShengDsProperties.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/QiShengDsProperties.java
similarity index 89%
rename from cms-framework/src/main/java/com/qs/serve/common/config/properties/QiShengDsProperties.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/QiShengDsProperties.java
index e1cd414..518915f 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/config/properties/QiShengDsProperties.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/QiShengDsProperties.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.config.properties;
+package com.qs.serve.framework.base.config.properties;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/config/properties/RedisProperties.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/RedisProperties.java
similarity index 88%
rename from cms-framework/src/main/java/com/qs/serve/common/config/properties/RedisProperties.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/RedisProperties.java
index 34cd197..574f63c 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/config/properties/RedisProperties.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/RedisProperties.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.config.properties;
+package com.qs.serve.framework.base.config.properties;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/config/properties/SeeYonProperties.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/SeeYonProperties.java
similarity index 88%
rename from cms-framework/src/main/java/com/qs/serve/common/config/properties/SeeYonProperties.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/SeeYonProperties.java
index 55cd2f3..ecc41d0 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/config/properties/SeeYonProperties.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/SeeYonProperties.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.config.properties;
+package com.qs.serve.framework.base.config.properties;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/config/properties/UploadProperties.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/UploadProperties.java
similarity index 88%
rename from cms-framework/src/main/java/com/qs/serve/common/config/properties/UploadProperties.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/UploadProperties.java
index a18b81e..41ba293 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/config/properties/UploadProperties.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/config/properties/UploadProperties.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.config.properties;
+package com.qs.serve.framework.base.config.properties;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/framework/interceptor/LimitSubmitInterceptor.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/interceptor/LimitSubmitInterceptor.java
similarity index 88%
rename from cms-framework/src/main/java/com/qs/serve/common/framework/interceptor/LimitSubmitInterceptor.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/interceptor/LimitSubmitInterceptor.java
index c778351..f337b10 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/framework/interceptor/LimitSubmitInterceptor.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/interceptor/LimitSubmitInterceptor.java
@@ -1,9 +1,9 @@
-package com.qs.serve.common.framework.interceptor;
+package com.qs.serve.framework.base.framework.interceptor;
 
-import com.qs.serve.common.framework.redis.RedisService;
-import com.qs.serve.common.model.HttpResponsePrintUtil;
-import com.qs.serve.common.model.annotation.LimitSubmit;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.framework.base.model.HttpResponsePrintUtil;
+import com.qs.serve.common.annotation.LimitSubmit;
+import com.qs.serve.common.utils.StringUtils;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.HandlerInterceptor;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/framework/interceptor/LocalDateTimeFormatSerializer.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/interceptor/LocalDateTimeFormatSerializer.java
similarity index 93%
rename from cms-framework/src/main/java/com/qs/serve/common/framework/interceptor/LocalDateTimeFormatSerializer.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/interceptor/LocalDateTimeFormatSerializer.java
index 32536cb..da9952c 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/framework/interceptor/LocalDateTimeFormatSerializer.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/interceptor/LocalDateTimeFormatSerializer.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.framework.interceptor;
+package com.qs.serve.framework.base.framework.interceptor;
 
 import com.alibaba.fastjson.serializer.JSONSerializer;
 import com.alibaba.fastjson.serializer.ObjectSerializer;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/framework/interceptor/RepeatSubmitInterceptor.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/interceptor/RepeatSubmitInterceptor.java
similarity index 94%
rename from cms-framework/src/main/java/com/qs/serve/common/framework/interceptor/RepeatSubmitInterceptor.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/interceptor/RepeatSubmitInterceptor.java
index 0aec072..8c2f08b 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/framework/interceptor/RepeatSubmitInterceptor.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/interceptor/RepeatSubmitInterceptor.java
@@ -1,8 +1,8 @@
-package com.qs.serve.common.framework.interceptor;
+package com.qs.serve.framework.base.framework.interceptor;
 
-import com.qs.serve.common.model.HttpResponsePrintUtil;
-import com.qs.serve.common.model.annotation.RepeatSubmit;
-import com.qs.serve.common.util.JsonUtil;
+import com.qs.serve.framework.base.model.HttpResponsePrintUtil;
+import com.qs.serve.common.annotation.RepeatSubmit;
+import com.qs.serve.framework.base.util.JsonUtil;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.HandlerInterceptor;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/framework/manager/AsyncManager.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/manager/AsyncManager.java
similarity index 85%
rename from cms-framework/src/main/java/com/qs/serve/common/framework/manager/AsyncManager.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/manager/AsyncManager.java
index d82e34f..911c7c1 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/framework/manager/AsyncManager.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/manager/AsyncManager.java
@@ -1,7 +1,7 @@
-package com.qs.serve.common.framework.manager;
+package com.qs.serve.framework.base.framework.manager;
 
-import com.qs.serve.common.util.SpringUtils;
-import com.qs.serve.common.util.ThreadsUtils;
+import com.qs.serve.framework.base.util.SpringUtils;
+import com.qs.serve.framework.base.util.ThreadsUtils;
 
 import java.util.TimerTask;
 import java.util.concurrent.ScheduledExecutorService;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/framework/redis/RedisService.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/redis/RedisService.java
similarity index 99%
rename from cms-framework/src/main/java/com/qs/serve/common/framework/redis/RedisService.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/redis/RedisService.java
index afb0f55..b43a4e4 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/framework/redis/RedisService.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/redis/RedisService.java
@@ -1,6 +1,6 @@
-package com.qs.serve.common.framework.redis;
+package com.qs.serve.framework.base.framework.redis;
 
-import com.qs.serve.common.util.Assert;
+import com.qs.serve.common.exception.Assert;
 import lombok.AllArgsConstructor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/framework/redis/TtlRedisCacheManager.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/redis/TtlRedisCacheManager.java
similarity index 95%
rename from cms-framework/src/main/java/com/qs/serve/common/framework/redis/TtlRedisCacheManager.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/redis/TtlRedisCacheManager.java
index 53ffc9b..f8c31c0 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/framework/redis/TtlRedisCacheManager.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/redis/TtlRedisCacheManager.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.framework.redis;
+package com.qs.serve.framework.base.framework.redis;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.cache.RedisCache;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/framework/security/handler/SecurityAccessDeniedHandler.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/security/handler/SecurityAccessDeniedHandler.java
similarity index 83%
rename from cms-framework/src/main/java/com/qs/serve/common/framework/security/handler/SecurityAccessDeniedHandler.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/security/handler/SecurityAccessDeniedHandler.java
index eae472a..e98c0b4 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/framework/security/handler/SecurityAccessDeniedHandler.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/security/handler/SecurityAccessDeniedHandler.java
@@ -1,6 +1,6 @@
-package com.qs.serve.common.framework.security.handler;
+package com.qs.serve.framework.base.framework.security.handler;
 
-import com.qs.serve.common.model.HttpResponsePrintUtil;
+import com.qs.serve.framework.base.model.HttpResponsePrintUtil;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.web.access.AccessDeniedHandler;
 
diff --git a/cms-framework/src/main/java/com/qs/serve/common/framework/security/handler/SecurityAuthenticationFailureHandler.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/security/handler/SecurityAuthenticationFailureHandler.java
similarity index 85%
rename from cms-framework/src/main/java/com/qs/serve/common/framework/security/handler/SecurityAuthenticationFailureHandler.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/security/handler/SecurityAuthenticationFailureHandler.java
index fa5cef6..f94fb60 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/framework/security/handler/SecurityAuthenticationFailureHandler.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/security/handler/SecurityAuthenticationFailureHandler.java
@@ -1,6 +1,6 @@
-package com.qs.serve.common.framework.security.handler;
+package com.qs.serve.framework.base.framework.security.handler;
 
-import com.qs.serve.common.model.HttpResponsePrintUtil;
+import com.qs.serve.framework.base.model.HttpResponsePrintUtil;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.authentication.AuthenticationFailureHandler;
 
diff --git a/cms-framework/src/main/java/com/qs/serve/common/framework/security/model/LoginUser.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/security/model/LoginUser.java
similarity index 97%
rename from cms-framework/src/main/java/com/qs/serve/common/framework/security/model/LoginUser.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/security/model/LoginUser.java
index 4744121..a0643c8 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/framework/security/model/LoginUser.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/security/model/LoginUser.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.framework.security.model;
+package com.qs.serve.framework.base.framework.security.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/framework/security/model/LoginUserDTO.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/security/model/LoginUserDTO.java
similarity index 91%
rename from cms-framework/src/main/java/com/qs/serve/common/framework/security/model/LoginUserDTO.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/security/model/LoginUserDTO.java
index 2c847ca..6388358 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/framework/security/model/LoginUserDTO.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/security/model/LoginUserDTO.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.framework.security.model;
+package com.qs.serve.framework.base.framework.security.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/framework/security/model/LoginUserType.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/security/model/LoginUserType.java
similarity index 90%
rename from cms-framework/src/main/java/com/qs/serve/common/framework/security/model/LoginUserType.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/security/model/LoginUserType.java
index 8538e03..3d9246d 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/framework/security/model/LoginUserType.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/security/model/LoginUserType.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.framework.security.model;
+package com.qs.serve.framework.base.framework.security.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/framework/security/util/SecurityPermitUtil.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/security/util/SecurityPermitUtil.java
similarity index 92%
rename from cms-framework/src/main/java/com/qs/serve/common/framework/security/util/SecurityPermitUtil.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/security/util/SecurityPermitUtil.java
index b03fac8..a9147be 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/framework/security/util/SecurityPermitUtil.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/framework/security/util/SecurityPermitUtil.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.framework.security.util;
+package com.qs.serve.framework.base.framework.security.util;
 
 /**
  * @Author JcYen
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/AmountDTO.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/AmountDTO.java
similarity index 81%
rename from cms-framework/src/main/java/com/qs/serve/common/model/AmountDTO.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/AmountDTO.java
index b663b89..745ba87 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/AmountDTO.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/AmountDTO.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.model;
+package com.qs.serve.framework.base.model;
 
 import lombok.Data;
 
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/HttpResponsePrintUtil.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/HttpResponsePrintUtil.java
similarity index 96%
rename from cms-framework/src/main/java/com/qs/serve/common/model/HttpResponsePrintUtil.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/HttpResponsePrintUtil.java
index 9aa883d..84c1665 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/HttpResponsePrintUtil.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/HttpResponsePrintUtil.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.model;
+package com.qs.serve.framework.base.model;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/chart/BiCommonCounter.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/chart/BiCommonCounter.java
similarity index 80%
rename from cms-framework/src/main/java/com/qs/serve/common/model/chart/BiCommonCounter.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/chart/BiCommonCounter.java
index 3403a26..24cec03 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/chart/BiCommonCounter.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/chart/BiCommonCounter.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.model.chart;
+package com.qs.serve.framework.base.model.chart;
 
 import lombok.Data;
 
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/chart/BiMonthCounter.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/chart/BiMonthCounter.java
similarity index 76%
rename from cms-framework/src/main/java/com/qs/serve/common/model/chart/BiMonthCounter.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/chart/BiMonthCounter.java
index ed23bea..aeedbfe 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/chart/BiMonthCounter.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/chart/BiMonthCounter.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.model.chart;
+package com.qs.serve.framework.base.model.chart;
 
 import lombok.Data;
 
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/chart/ChartAxisColumn.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/chart/ChartAxisColumn.java
similarity index 94%
rename from cms-framework/src/main/java/com/qs/serve/common/model/chart/ChartAxisColumn.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/chart/ChartAxisColumn.java
index 3f01cb9..e0cf4d6 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/chart/ChartAxisColumn.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/chart/ChartAxisColumn.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.model.chart;
+package com.qs.serve.framework.base.model.chart;
 
 import lombok.Data;
 
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/chart/ChartDataVo.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/chart/ChartDataVo.java
similarity index 99%
rename from cms-framework/src/main/java/com/qs/serve/common/model/chart/ChartDataVo.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/chart/ChartDataVo.java
index 7346a6f..4dfab9b 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/chart/ChartDataVo.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/chart/ChartDataVo.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.model.chart;
+package com.qs.serve.framework.base.model.chart;
 
 import lombok.Data;
 
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/chart/ChartGroupItem.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/chart/ChartGroupItem.java
similarity index 80%
rename from cms-framework/src/main/java/com/qs/serve/common/model/chart/ChartGroupItem.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/chart/ChartGroupItem.java
index 6dc51d2..c9cda02 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/chart/ChartGroupItem.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/chart/ChartGroupItem.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.model.chart;
+package com.qs.serve.framework.base.model.chart;
 
 import lombok.Data;
 
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/chart/ChartSeriesItem.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/chart/ChartSeriesItem.java
similarity index 85%
rename from cms-framework/src/main/java/com/qs/serve/common/model/chart/ChartSeriesItem.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/chart/ChartSeriesItem.java
index 0e5e99e..d47ed86 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/chart/ChartSeriesItem.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/chart/ChartSeriesItem.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.model.chart;
+package com.qs.serve.framework.base.model.chart;
 
 import lombok.Data;
 
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/chart/PrintChart.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/chart/PrintChart.java
similarity index 96%
rename from cms-framework/src/main/java/com/qs/serve/common/model/chart/PrintChart.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/chart/PrintChart.java
index 846aed1..97b3a66 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/chart/PrintChart.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/chart/PrintChart.java
@@ -1,6 +1,6 @@
-package com.qs.serve.common.model.chart;
+package com.qs.serve.framework.base.model.chart;
 
-import com.qs.serve.common.util.JsonUtil;
+import com.qs.serve.framework.base.util.JsonUtil;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/consts/ApplyTypeConst.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/consts/ApplyTypeConst.java
similarity index 79%
rename from cms-framework/src/main/java/com/qs/serve/common/model/consts/ApplyTypeConst.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/consts/ApplyTypeConst.java
index 9a4a958..ecd3524 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/consts/ApplyTypeConst.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/consts/ApplyTypeConst.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.model.consts;
+package com.qs.serve.framework.base.model.consts;
 
 /**
  * @author YenHex
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/consts/BudgetLogRollbackFlag.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/consts/BudgetLogRollbackFlag.java
similarity index 86%
rename from cms-framework/src/main/java/com/qs/serve/common/model/consts/BudgetLogRollbackFlag.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/consts/BudgetLogRollbackFlag.java
index 4d5772c..700b4d7 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/consts/BudgetLogRollbackFlag.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/consts/BudgetLogRollbackFlag.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.model.consts;
+package com.qs.serve.framework.base.model.consts;
 
 /**
  * @author YenHex
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/consts/DSName.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/consts/DSName.java
similarity index 68%
rename from cms-framework/src/main/java/com/qs/serve/common/model/consts/DSName.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/consts/DSName.java
index bd74fcd..3d30bd1 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/consts/DSName.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/consts/DSName.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.model.consts;
+package com.qs.serve.framework.base.model.consts;
 
 /**
  * @author YenHex
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/consts/GySysConst.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/consts/GySysConst.java
similarity index 95%
rename from cms-framework/src/main/java/com/qs/serve/common/model/consts/GySysConst.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/consts/GySysConst.java
index 23f36f3..9bfc6f0 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/consts/GySysConst.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/consts/GySysConst.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.model.consts;
+package com.qs.serve.framework.base.model.consts;
 
 /**
  * 系统字段
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/consts/OssConst.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/consts/OssConst.java
similarity index 93%
rename from cms-framework/src/main/java/com/qs/serve/common/model/consts/OssConst.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/consts/OssConst.java
index 6a8b2d2..24dd0d6 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/consts/OssConst.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/consts/OssConst.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.model.consts;
+package com.qs.serve.framework.base.model.consts;
 
 /**
  * @author YenHex
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/consts/RedisCacheKeys.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/consts/RedisCacheKeys.java
similarity index 93%
rename from cms-framework/src/main/java/com/qs/serve/common/model/consts/RedisCacheKeys.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/consts/RedisCacheKeys.java
index de9ac61..9b6be0a 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/consts/RedisCacheKeys.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/consts/RedisCacheKeys.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.model.consts;
+package com.qs.serve.framework.base.model.consts;
 
 /**
  * @author YenHex
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/consts/SysConfigKey.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/consts/SysConfigKey.java
similarity index 88%
rename from cms-framework/src/main/java/com/qs/serve/common/model/consts/SysConfigKey.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/consts/SysConfigKey.java
index 4999b38..9764ffb 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/consts/SysConfigKey.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/consts/SysConfigKey.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.model.consts;
+package com.qs.serve.framework.base.model.consts;
 
 /**
  * 系统配置
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/dto/CommonIdsParam.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/CommonIdsParam.java
similarity index 77%
rename from cms-framework/src/main/java/com/qs/serve/common/model/dto/CommonIdsParam.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/CommonIdsParam.java
index ba8c866..0f10b8b 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/dto/CommonIdsParam.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/CommonIdsParam.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.model.dto;
+package com.qs.serve.framework.base.model.dto;
 
 import lombok.Data;
 
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/dto/DateSplitDTO.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/DateSplitDTO.java
similarity index 88%
rename from cms-framework/src/main/java/com/qs/serve/common/model/dto/DateSplitDTO.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/DateSplitDTO.java
index f63a795..85b7115 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/dto/DateSplitDTO.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/DateSplitDTO.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.model.dto;
+package com.qs.serve.framework.base.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/dto/DiffFieldVal.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/DiffFieldVal.java
similarity index 79%
rename from cms-framework/src/main/java/com/qs/serve/common/model/dto/DiffFieldVal.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/DiffFieldVal.java
index 021bf12..8b60764 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/dto/DiffFieldVal.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/DiffFieldVal.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.model.dto;
+package com.qs.serve.framework.base.model.dto;
 
 import lombok.Data;
 
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/dto/HeaderOption.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/HeaderOption.java
similarity index 90%
rename from cms-framework/src/main/java/com/qs/serve/common/model/dto/HeaderOption.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/HeaderOption.java
index cd5dd12..62c802c 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/dto/HeaderOption.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/HeaderOption.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.model.dto;
+package com.qs.serve.framework.base.model.dto;
 
 import lombok.Data;
 
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/dto/RowParam.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/RowParam.java
similarity index 82%
rename from cms-framework/src/main/java/com/qs/serve/common/model/dto/RowParam.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/RowParam.java
index a7c491b..0146118 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/dto/RowParam.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/RowParam.java
@@ -1,6 +1,6 @@
-package com.qs.serve.common.model.dto;
+package com.qs.serve.framework.base.model.dto;
 
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.common.utils.PageUtil;
 import lombok.Data;
 
 /**
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/dto/SimpleCountValue.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/SimpleCountValue.java
similarity index 75%
rename from cms-framework/src/main/java/com/qs/serve/common/model/dto/SimpleCountValue.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/SimpleCountValue.java
index ac9edc2..880b4af 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/dto/SimpleCountValue.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/SimpleCountValue.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.model.dto;
+package com.qs.serve.framework.base.model.dto;
 
 import lombok.Data;
 
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/dto/SimpleKeyValue.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/SimpleKeyValue.java
similarity index 94%
rename from cms-framework/src/main/java/com/qs/serve/common/model/dto/SimpleKeyValue.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/SimpleKeyValue.java
index 058cb32..13add94 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/dto/SimpleKeyValue.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/SimpleKeyValue.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.model.dto;
+package com.qs.serve.framework.base.model.dto;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/dto/TargetDTO.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/TargetDTO.java
similarity index 91%
rename from cms-framework/src/main/java/com/qs/serve/common/model/dto/TargetDTO.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/TargetDTO.java
index b4821cb..2c106b5 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/dto/TargetDTO.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/TargetDTO.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.model.dto;
+package com.qs.serve.framework.base.model.dto;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/dto/TargetObjectDTO.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/TargetObjectDTO.java
similarity index 80%
rename from cms-framework/src/main/java/com/qs/serve/common/model/dto/TargetObjectDTO.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/TargetObjectDTO.java
index f429482..62872cc 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/dto/TargetObjectDTO.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/dto/TargetObjectDTO.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.model.dto;
+package com.qs.serve.framework.base.model.dto;
 
 import lombok.Data;
 
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/oa/OaFormMainProcess.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/oa/OaFormMainProcess.java
similarity index 92%
rename from cms-framework/src/main/java/com/qs/serve/common/model/oa/OaFormMainProcess.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/oa/OaFormMainProcess.java
index 7902459..cec0a92 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/oa/OaFormMainProcess.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/oa/OaFormMainProcess.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.model.oa;
+package com.qs.serve.framework.base.model.oa;
 
 import lombok.Data;
 
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/oa/OaUploadFile.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/oa/OaUploadFile.java
similarity index 86%
rename from cms-framework/src/main/java/com/qs/serve/common/model/oa/OaUploadFile.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/oa/OaUploadFile.java
index 0c13908..fb67d82 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/model/oa/OaUploadFile.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/model/oa/OaUploadFile.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.model.oa;
+package com.qs.serve.framework.base.model.oa;
 
 import lombok.Data;
 
diff --git a/cms-framework/src/main/java/com/qs/serve/common/util/BusinessDifferenceUtil.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/BusinessDifferenceUtil.java
similarity index 92%
rename from cms-framework/src/main/java/com/qs/serve/common/util/BusinessDifferenceUtil.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/BusinessDifferenceUtil.java
index 39beb3c..b19a3de 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/util/BusinessDifferenceUtil.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/BusinessDifferenceUtil.java
@@ -1,7 +1,7 @@
-package com.qs.serve.common.util;
+package com.qs.serve.framework.base.util;
 
-import com.qs.serve.common.model.annotation.BusinessDifference;
-import com.qs.serve.common.model.dto.DiffFieldVal;
+import com.qs.serve.common.annotation.BusinessDifference;
+import com.qs.serve.framework.base.model.dto.DiffFieldVal;
 import lombok.SneakyThrows;
 
 import java.lang.annotation.Annotation;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/util/CodeGenUtil.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/CodeGenUtil.java
similarity index 96%
rename from cms-framework/src/main/java/com/qs/serve/common/util/CodeGenUtil.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/CodeGenUtil.java
index e3ca5ca..f9fb9b2 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/util/CodeGenUtil.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/CodeGenUtil.java
@@ -1,7 +1,7 @@
-package com.qs.serve.common.util;
+package com.qs.serve.framework.base.util;
 
-import com.qs.serve.common.config.DevEnvironmentConfig;
-import com.qs.serve.common.framework.redis.RedisService;
+import com.qs.serve.framework.base.config.DevEnvironmentConfig;
+import com.qs.serve.framework.base.framework.redis.RedisService;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import org.springframework.beans.BeansException;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/util/CollectionUtil.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/CollectionUtil.java
similarity index 98%
rename from cms-framework/src/main/java/com/qs/serve/common/util/CollectionUtil.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/CollectionUtil.java
index b566282..998bd01 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/util/CollectionUtil.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/CollectionUtil.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.util;
+package com.qs.serve.framework.base.util;
 
 import lombok.experimental.UtilityClass;
 
diff --git a/cms-framework/src/main/java/com/qs/serve/common/util/DateSplitUtil.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/DateSplitUtil.java
similarity index 96%
rename from cms-framework/src/main/java/com/qs/serve/common/util/DateSplitUtil.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/DateSplitUtil.java
index 1504ed1..a20ab75 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/util/DateSplitUtil.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/DateSplitUtil.java
@@ -1,6 +1,6 @@
-package com.qs.serve.common.util;
+package com.qs.serve.framework.base.util;
 
-import com.qs.serve.common.model.dto.DateSplitDTO;
+import com.qs.serve.framework.base.model.dto.DateSplitDTO;
 import lombok.experimental.UtilityClass;
 
 import java.time.LocalDate;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/util/DateUtils.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/DateUtils.java
similarity index 97%
rename from cms-framework/src/main/java/com/qs/serve/common/util/DateUtils.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/DateUtils.java
index f421365..c0acf67 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/util/DateUtils.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/DateUtils.java
@@ -1,6 +1,6 @@
-package com.qs.serve.common.util;
+package com.qs.serve.framework.base.util;
 
-import com.qs.serve.common.util.model.DateFormatString;
+import com.qs.serve.framework.base.util.model.DateFormatString;
 import lombok.experimental.UtilityClass;
 
 import java.text.ParseException;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/util/HttpUtil.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/HttpUtil.java
similarity index 97%
rename from cms-framework/src/main/java/com/qs/serve/common/util/HttpUtil.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/HttpUtil.java
index 6a251cc..618f0ce 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/util/HttpUtil.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/HttpUtil.java
@@ -1,7 +1,8 @@
-package com.qs.serve.common.util;
+package com.qs.serve.framework.base.util;
 
 import com.alibaba.fastjson.JSONObject;
-import com.qs.serve.common.model.dto.R;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.model.R;
 import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.ParseException;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/util/IdUtil.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/IdUtil.java
similarity index 97%
rename from cms-framework/src/main/java/com/qs/serve/common/util/IdUtil.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/IdUtil.java
index d15bd32..d24af7c 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/util/IdUtil.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/IdUtil.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.util;
+package com.qs.serve.framework.base.util;
 
 import cn.hutool.core.lang.Snowflake;
 
diff --git a/cms-framework/src/main/java/com/qs/serve/common/util/JdbcUtil.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/JdbcUtil.java
similarity index 97%
rename from cms-framework/src/main/java/com/qs/serve/common/util/JdbcUtil.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/JdbcUtil.java
index 520b3f5..e50b736 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/util/JdbcUtil.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/JdbcUtil.java
@@ -1,5 +1,6 @@
-package com.qs.serve.common.util;
+package com.qs.serve.framework.base.util;
 
+import com.qs.serve.common.utils.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 
 import java.sql.*;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/util/JsonUtil.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/JsonUtil.java
similarity index 96%
rename from cms-framework/src/main/java/com/qs/serve/common/util/JsonUtil.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/JsonUtil.java
index 6796df3..9fd2776 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/util/JsonUtil.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/JsonUtil.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.util;
+package com.qs.serve.framework.base.util;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -9,7 +9,7 @@ import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import com.qs.serve.common.framework.interceptor.LocalDateTimeFormatSerializer;
+import com.qs.serve.framework.base.framework.interceptor.LocalDateTimeFormatSerializer;
 import lombok.experimental.UtilityClass;
 
 import java.time.LocalDateTime;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/util/JumpToUtil.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/JumpToUtil.java
similarity index 89%
rename from cms-framework/src/main/java/com/qs/serve/common/util/JumpToUtil.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/JumpToUtil.java
index 3792f0b..f010ca1 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/util/JumpToUtil.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/JumpToUtil.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.util;
+package com.qs.serve.framework.base.util;
 
 import lombok.experimental.UtilityClass;
 
diff --git a/cms-framework/src/main/java/com/qs/serve/common/util/JwtUtils.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/JwtUtils.java
similarity index 94%
rename from cms-framework/src/main/java/com/qs/serve/common/util/JwtUtils.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/JwtUtils.java
index 9f1c272..0de1603 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/util/JwtUtils.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/JwtUtils.java
@@ -1,10 +1,10 @@
-package com.qs.serve.common.util;
+package com.qs.serve.framework.base.util;
 
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.JWTVerifier;
 import com.auth0.jwt.algorithms.Algorithm;
-import com.qs.serve.common.config.JwtConfig;
-import com.qs.serve.common.framework.security.model.LoginUserType;
+import com.qs.serve.framework.base.config.JwtConfig;
+import com.qs.serve.framework.base.framework.security.model.LoginUserType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.authentication.BadCredentialsException;
 
diff --git a/cms-framework/src/main/java/com/qs/serve/common/util/MinioUtil.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/MinioUtil.java
similarity index 97%
rename from cms-framework/src/main/java/com/qs/serve/common/util/MinioUtil.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/MinioUtil.java
index 6425bff..3a61acd 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/util/MinioUtil.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/MinioUtil.java
@@ -1,6 +1,6 @@
-package com.qs.serve.common.util;
+package com.qs.serve.framework.base.util;
 
-import com.qs.serve.common.model.enums.PolicyType;
+import com.qs.serve.common.enums.PolicyType;
 import lombok.experimental.UtilityClass;
 
 /**
diff --git a/cms-framework/src/main/java/com/qs/serve/common/util/NanoIdUtils.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/NanoIdUtils.java
similarity index 98%
rename from cms-framework/src/main/java/com/qs/serve/common/util/NanoIdUtils.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/NanoIdUtils.java
index da8b07d..9420fe0 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/util/NanoIdUtils.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/NanoIdUtils.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.util;
+package com.qs.serve.framework.base.util;
 
 import java.security.SecureRandom;
 import java.util.Random;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/util/SmsReflectUtil.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/SmsReflectUtil.java
similarity index 89%
rename from cms-framework/src/main/java/com/qs/serve/common/util/SmsReflectUtil.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/SmsReflectUtil.java
index 1b6b34f..09e1f0a 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/util/SmsReflectUtil.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/SmsReflectUtil.java
@@ -1,7 +1,7 @@
-package com.qs.serve.common.util;
+package com.qs.serve.framework.base.util;
 
-import com.qs.serve.common.util.model.wx.SmsBaseDto;
-import com.qs.serve.common.util.model.wx.WxSmsProp;
+import com.qs.serve.framework.base.util.model.wx.SmsBaseDto;
+import com.qs.serve.framework.base.util.model.wx.WxSmsProp;
 import me.chanjar.weixin.mp.bean.template.WxMpTemplateData;
 
 import java.lang.annotation.Annotation;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/util/SpringUtils.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/SpringUtils.java
similarity index 98%
rename from cms-framework/src/main/java/com/qs/serve/common/util/SpringUtils.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/SpringUtils.java
index c2c0bc7..5e9df8e 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/util/SpringUtils.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/SpringUtils.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.util;
+package com.qs.serve.framework.base.util;
 
 import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.BeansException;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/util/SqlServerUtil.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/SqlServerUtil.java
similarity index 99%
rename from cms-framework/src/main/java/com/qs/serve/common/util/SqlServerUtil.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/SqlServerUtil.java
index 3ad8c0a..1f5ad56 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/util/SqlServerUtil.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/SqlServerUtil.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.util;
+package com.qs.serve.framework.base.util;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/util/ThreadsUtils.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/ThreadsUtils.java
similarity index 98%
rename from cms-framework/src/main/java/com/qs/serve/common/util/ThreadsUtils.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/ThreadsUtils.java
index 03f7e2d..9c83ebb 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/util/ThreadsUtils.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/ThreadsUtils.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.util;
+package com.qs.serve.framework.base.util;
 
 import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/util/TianYiYunSmsUtil.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/TianYiYunSmsUtil.java
similarity index 97%
rename from cms-framework/src/main/java/com/qs/serve/common/util/TianYiYunSmsUtil.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/TianYiYunSmsUtil.java
index ffde60c..f50cc93 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/util/TianYiYunSmsUtil.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/TianYiYunSmsUtil.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.util;
+package com.qs.serve.framework.base.util;
 
 import cn.hutool.crypto.digest.DigestUtil;
 import lombok.extern.slf4j.Slf4j;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/util/TokenUtil.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/TokenUtil.java
similarity index 90%
rename from cms-framework/src/main/java/com/qs/serve/common/util/TokenUtil.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/TokenUtil.java
index 89aec72..e5b57b1 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/util/TokenUtil.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/TokenUtil.java
@@ -1,7 +1,7 @@
-package com.qs.serve.common.util;
+package com.qs.serve.framework.base.util;
 
 
-import com.qs.serve.common.util.model.DesUtils;
+import com.qs.serve.framework.base.util.model.DesUtils;
 
 /**
  * @author YenHex
diff --git a/cms-framework/src/main/java/com/qs/serve/common/util/UploadUtil.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/UploadUtil.java
similarity index 95%
rename from cms-framework/src/main/java/com/qs/serve/common/util/UploadUtil.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/UploadUtil.java
index 09eb9e5..4634f2d 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/util/UploadUtil.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/UploadUtil.java
@@ -1,6 +1,7 @@
-package com.qs.serve.common.util;
+package com.qs.serve.framework.base.util;
 
 import cn.hutool.core.io.FileUtil;
+import com.qs.serve.common.exception.Assert;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/util/ValidateTools.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/ValidateTools.java
similarity index 94%
rename from cms-framework/src/main/java/com/qs/serve/common/util/ValidateTools.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/ValidateTools.java
index 0bc9f16..4b27b2d 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/util/ValidateTools.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/ValidateTools.java
@@ -1,6 +1,7 @@
-package com.qs.serve.common.util;
+package com.qs.serve.framework.base.util;
 
-import com.qs.serve.common.framework.exception.BusinessException;
+import com.qs.serve.common.exception.BusinessException;
+import com.qs.serve.common.utils.StringUtils;
 import lombok.experimental.UtilityClass;
 import org.hibernate.validator.HibernateValidator;
 import org.springframework.util.CollectionUtils;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/util/bus/QueryFilterUtil.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/bus/QueryFilterUtil.java
similarity index 89%
rename from cms-framework/src/main/java/com/qs/serve/common/util/bus/QueryFilterUtil.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/bus/QueryFilterUtil.java
index e9b5c8b..f36618b 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/util/bus/QueryFilterUtil.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/bus/QueryFilterUtil.java
@@ -1,6 +1,6 @@
-package com.qs.serve.common.util.bus;
+package com.qs.serve.framework.base.util.bus;
 
-import com.qs.serve.common.util.Assert;
+import com.qs.serve.common.exception.Assert;
 
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/util/model/DateFormatString.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/model/DateFormatString.java
similarity index 90%
rename from cms-framework/src/main/java/com/qs/serve/common/util/model/DateFormatString.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/model/DateFormatString.java
index 43aa4e4..6fd9fe9 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/util/model/DateFormatString.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/model/DateFormatString.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.util.model;
+package com.qs.serve.framework.base.util.model;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/util/model/DesUtils.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/model/DesUtils.java
similarity index 98%
rename from cms-framework/src/main/java/com/qs/serve/common/util/model/DesUtils.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/model/DesUtils.java
index 2617af1..731d785 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/util/model/DesUtils.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/model/DesUtils.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.util.model;
+package com.qs.serve.framework.base.util.model;
 
 import javax.crypto.Cipher;
 import java.security.Key;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/util/model/QsJsonLocalDateTimeDeserializer.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/model/QsJsonLocalDateTimeDeserializer.java
similarity index 94%
rename from cms-framework/src/main/java/com/qs/serve/common/util/model/QsJsonLocalDateTimeDeserializer.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/model/QsJsonLocalDateTimeDeserializer.java
index ad46dfb..9f1eff7 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/util/model/QsJsonLocalDateTimeDeserializer.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/model/QsJsonLocalDateTimeDeserializer.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.util.model;
+package com.qs.serve.framework.base.util.model;
 
 import com.fasterxml.jackson.core.JacksonException;
 import com.fasterxml.jackson.core.JsonParser;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/util/model/wx/SmsBaseDto.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/model/wx/SmsBaseDto.java
similarity index 63%
rename from cms-framework/src/main/java/com/qs/serve/common/util/model/wx/SmsBaseDto.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/model/wx/SmsBaseDto.java
index cdf477c..c7fe5aa 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/util/model/wx/SmsBaseDto.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/model/wx/SmsBaseDto.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.util.model.wx;
+package com.qs.serve.framework.base.util.model.wx;
 
 /**
  * @author YenHex
diff --git a/cms-framework/src/main/java/com/qs/serve/common/util/model/wx/WxSmsProp.java b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/model/wx/WxSmsProp.java
similarity index 84%
rename from cms-framework/src/main/java/com/qs/serve/common/util/model/wx/WxSmsProp.java
rename to cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/model/wx/WxSmsProp.java
index 2e5d73c..7780303 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/util/model/wx/WxSmsProp.java
+++ b/cms-framework/cms-framework-base/src/main/java/com/qs/serve/framework/base/util/model/wx/WxSmsProp.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.util.model.wx;
+package com.qs.serve.framework.base.util.model.wx;
 
 import java.lang.annotation.*;
 
diff --git a/cms-framework/cms-framework-mvc/pom.xml b/cms-framework/cms-framework-mvc/pom.xml
new file mode 100644
index 0000000..8f833d2
--- /dev/null
+++ b/cms-framework/cms-framework-mvc/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>cms-framework</artifactId>
+        <groupId>com.qs</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>cms-framework-mvc</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+</project>
diff --git a/cms-framework/cms-framework-mybatis-plus/pom.xml b/cms-framework/cms-framework-mybatis-plus/pom.xml
new file mode 100644
index 0000000..53904be
--- /dev/null
+++ b/cms-framework/cms-framework-mybatis-plus/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>cms-framework</artifactId>
+        <groupId>com.qs</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>cms-framework-mybatis-plus</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>com.qs</groupId>
+            <artifactId>cms-common</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/MyBatisConfig.java b/cms-framework/cms-framework-mybatis-plus/src/main/java/com/qs/serve/mbp/config/MyBatisConfig.java
similarity index 98%
rename from cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/MyBatisConfig.java
rename to cms-framework/cms-framework-mybatis-plus/src/main/java/com/qs/serve/mbp/config/MyBatisConfig.java
index 8c80687..0621eb3 100644
--- a/cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/MyBatisConfig.java
+++ b/cms-framework/cms-framework-mybatis-plus/src/main/java/com/qs/serve/mbp/config/MyBatisConfig.java
@@ -1,4 +1,4 @@
-package com.qs.serve.actuator;
+package com.qs.serve.mbp.config;
 
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
diff --git a/cms-framework/cms-framework-mybatis-plus/src/main/java/com/qs/serve/mbp/context/SecurityUserUtil.java b/cms-framework/cms-framework-mybatis-plus/src/main/java/com/qs/serve/mbp/context/SecurityUserUtil.java
new file mode 100644
index 0000000..f11f7c2
--- /dev/null
+++ b/cms-framework/cms-framework-mybatis-plus/src/main/java/com/qs/serve/mbp/context/SecurityUserUtil.java
@@ -0,0 +1,29 @@
+package com.qs.serve.mbp.context;
+
+import lombok.experimental.UtilityClass;
+
+/**
+ * @author YenHex
+ * @since 2025/4/17
+ */
+@UtilityClass
+public class SecurityUserUtil {
+
+    private final static ThreadLocal<String> THREAD_TENANT = new ThreadLocal<>();
+    private final static ThreadLocal<String> THREAD_USER_ID = new ThreadLocal<>();
+
+    public static void setTenant(String value){THREAD_TENANT.set(value);}
+
+    public static String getTenant(){return THREAD_TENANT.get();}
+
+    public static void setUserId(String value){THREAD_USER_ID.set(value);}
+
+    public static String getUserId(){return THREAD_USER_ID.get();}
+
+    public static void removeThreadLocal(){
+        THREAD_TENANT.remove();
+        THREAD_USER_ID.remove();
+    }
+
+
+}
diff --git a/cms-framework/src/main/java/com/qs/serve/common/framework/mybatis/handler/meta/JsonStringTypeHandler.java b/cms-framework/cms-framework-mybatis-plus/src/main/java/com/qs/serve/mbp/handler/JsonStringTypeHandler.java
similarity index 95%
rename from cms-framework/src/main/java/com/qs/serve/common/framework/mybatis/handler/meta/JsonStringTypeHandler.java
rename to cms-framework/cms-framework-mybatis-plus/src/main/java/com/qs/serve/mbp/handler/JsonStringTypeHandler.java
index 9efe3ba..836ba81 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/framework/mybatis/handler/meta/JsonStringTypeHandler.java
+++ b/cms-framework/cms-framework-mybatis-plus/src/main/java/com/qs/serve/mbp/handler/JsonStringTypeHandler.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.framework.mybatis.handler.meta;
+package com.qs.serve.mbp.handler;
 
 import cn.hutool.json.JSONUtil;
 import org.apache.ibatis.type.BaseTypeHandler;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/framework/mybatis/handler/meta/SplitStringTypeHandler.java b/cms-framework/cms-framework-mybatis-plus/src/main/java/com/qs/serve/mbp/handler/SplitStringTypeHandler.java
similarity index 95%
rename from cms-framework/src/main/java/com/qs/serve/common/framework/mybatis/handler/meta/SplitStringTypeHandler.java
rename to cms-framework/cms-framework-mybatis-plus/src/main/java/com/qs/serve/mbp/handler/SplitStringTypeHandler.java
index ac02252..d2e640d 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/framework/mybatis/handler/meta/SplitStringTypeHandler.java
+++ b/cms-framework/cms-framework-mybatis-plus/src/main/java/com/qs/serve/mbp/handler/SplitStringTypeHandler.java
@@ -1,6 +1,6 @@
-package com.qs.serve.common.framework.mybatis.handler.meta;
+package com.qs.serve.mbp.handler;
 
-import com.qs.serve.common.util.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import org.apache.ibatis.type.BaseTypeHandler;
 import org.apache.ibatis.type.JdbcType;
 import org.apache.ibatis.type.MappedJdbcTypes;
diff --git a/cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/SysMetaHandler.java b/cms-framework/cms-framework-mybatis-plus/src/main/java/com/qs/serve/mbp/handler/SysMetaHandler.java
similarity index 66%
rename from cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/SysMetaHandler.java
rename to cms-framework/cms-framework-mybatis-plus/src/main/java/com/qs/serve/mbp/handler/SysMetaHandler.java
index ff329a4..d6de852 100644
--- a/cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/SysMetaHandler.java
+++ b/cms-framework/cms-framework-mybatis-plus/src/main/java/com/qs/serve/mbp/handler/SysMetaHandler.java
@@ -1,8 +1,7 @@
-package com.qs.serve.actuator;
+package com.qs.serve.mbp.handler;
 
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
-import com.qs.serve.common.framework.security.model.LoginUser;
-import com.qs.serve.modules.sys.common.AuthContextUtils;
+import com.qs.serve.mbp.context.SecurityUserUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.reflection.MetaObject;
 
@@ -18,19 +17,20 @@ public class SysMetaHandler implements MetaObjectHandler {
 
     @Override
     public void insertFill(MetaObject metaObject) {
-        LoginUser loginUser = AuthContextUtils.getLoginUser(false);
-        if(loginUser!=null){
-            this.strictInsertFill(metaObject, "createBy", () -> loginUser.getUserId(), String.class);
+        String userId = SecurityUserUtil.getUserId();
+        if(userId!=null){
+            this.strictInsertFill(metaObject, "createBy", () -> userId, String.class);
         }
         this.strictInsertFill(metaObject, "createTime", () -> LocalDateTime.now(), LocalDateTime.class);
     }
 
     @Override
     public void updateFill(MetaObject metaObject) {
-        LoginUser loginUser = AuthContextUtils.getLoginUser(false);
-        if(loginUser!=null){
-            this.strictUpdateFill(metaObject, "updateBy", () -> loginUser.getUserId(), String.class);
+        String userId = SecurityUserUtil.getUserId();
+        if(userId!=null){
+            this.strictUpdateFill(metaObject, "updateBy", () -> userId, String.class);
         }
         this.strictUpdateFill(metaObject, "updateTime", () -> LocalDateTime.now(), LocalDateTime.class);
     }
+
 }
diff --git a/cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/SysTenantHandler.java b/cms-framework/cms-framework-mybatis-plus/src/main/java/com/qs/serve/mbp/handler/SysTenantHandler.java
similarity index 77%
rename from cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/SysTenantHandler.java
rename to cms-framework/cms-framework-mybatis-plus/src/main/java/com/qs/serve/mbp/handler/SysTenantHandler.java
index b634a31..403d5ed 100644
--- a/cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/SysTenantHandler.java
+++ b/cms-framework/cms-framework-mybatis-plus/src/main/java/com/qs/serve/mbp/handler/SysTenantHandler.java
@@ -1,10 +1,9 @@
-package com.qs.serve.actuator;
+package com.qs.serve.mbp.handler;
 
 import com.baomidou.mybatisplus.extension.plugins.handler.TenantLineHandler;
-import com.qs.serve.common.model.consts.GySysConst;
-import com.qs.serve.common.model.enums.HttpCode;
-import com.qs.serve.common.util.Assert;
-import com.qs.serve.modules.sys.common.AuthContextUtils;
+import com.qs.serve.common.enums.HttpCode;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.mbp.context.SecurityUserUtil;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.StringValue;
 
@@ -26,7 +25,7 @@ public class SysTenantHandler implements TenantLineHandler {
 
     @Override
     public Expression getTenantId() {
-        String tenant = AuthContextUtils.getTenant();
+        String tenant = SecurityUserUtil.getTenant();
         if(tenant==null){
             Assert.throwEx(HttpCode.LOGIN_ERR_4001);
         }
@@ -35,7 +34,7 @@ public class SysTenantHandler implements TenantLineHandler {
 
     @Override
     public String getTenantIdColumn() {
-        return GySysConst.TENANT_COLUMN;
+        return "TENANT_COLUMN";
     }
 
     /**
diff --git a/cms-framework/src/main/java/com/qs/serve/common/framework/mybatis/handler/meta/TableNameAppendHandler.java b/cms-framework/cms-framework-mybatis-plus/src/main/java/com/qs/serve/mbp/handler/TableNameAppendHandler.java
similarity index 96%
rename from cms-framework/src/main/java/com/qs/serve/common/framework/mybatis/handler/meta/TableNameAppendHandler.java
rename to cms-framework/cms-framework-mybatis-plus/src/main/java/com/qs/serve/mbp/handler/TableNameAppendHandler.java
index 5b4520d..c30b3cb 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/framework/mybatis/handler/meta/TableNameAppendHandler.java
+++ b/cms-framework/cms-framework-mybatis-plus/src/main/java/com/qs/serve/mbp/handler/TableNameAppendHandler.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.framework.mybatis.handler.meta;
+package com.qs.serve.mbp.handler;
 
 import com.baomidou.mybatisplus.extension.plugins.handler.TableNameHandler;
 import lombok.extern.slf4j.Slf4j;
diff --git a/cms-framework/cms-framework-mybatis-plus/src/main/java/com/qs/serve/mbp/package-info.java b/cms-framework/cms-framework-mybatis-plus/src/main/java/com/qs/serve/mbp/package-info.java
new file mode 100644
index 0000000..a624faa
--- /dev/null
+++ b/cms-framework/cms-framework-mybatis-plus/src/main/java/com/qs/serve/mbp/package-info.java
@@ -0,0 +1 @@
+package com.qs.serve.mbp;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/framework/mybatis/query/AnnotationQueryStorage.java b/cms-framework/cms-framework-mybatis-plus/src/main/java/com/qs/serve/mbp/query/AnnotationQueryStorage.java
similarity index 94%
rename from cms-framework/src/main/java/com/qs/serve/common/framework/mybatis/query/AnnotationQueryStorage.java
rename to cms-framework/cms-framework-mybatis-plus/src/main/java/com/qs/serve/mbp/query/AnnotationQueryStorage.java
index fcdaf80..4f18d86 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/framework/mybatis/query/AnnotationQueryStorage.java
+++ b/cms-framework/cms-framework-mybatis-plus/src/main/java/com/qs/serve/mbp/query/AnnotationQueryStorage.java
@@ -1,12 +1,12 @@
-package com.qs.serve.common.framework.mybatis.query;
+package com.qs.serve.mbp.query;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.qs.serve.common.framework.mybatis.query.annotations.QueryWrap;
-import com.qs.serve.common.framework.mybatis.query.model.QueryFieldData;
-import com.qs.serve.common.framework.mybatis.query.model.QueryFieldDataValue;
-import com.qs.serve.common.framework.mybatis.query.model.QueryType;
-import com.qs.serve.common.util.WordUtil;
+import com.qs.serve.mbp.query.annotations.QueryWrap;
+import com.qs.serve.mbp.query.model.QueryFieldData;
+import com.qs.serve.mbp.query.model.QueryFieldDataValue;
+import com.qs.serve.mbp.query.model.QueryType;
+import com.qs.serve.common.utils.WordUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/framework/mybatis/query/annotations/QueryWrap.java b/cms-framework/cms-framework-mybatis-plus/src/main/java/com/qs/serve/mbp/query/annotations/QueryWrap.java
similarity index 82%
rename from cms-framework/src/main/java/com/qs/serve/common/framework/mybatis/query/annotations/QueryWrap.java
rename to cms-framework/cms-framework-mybatis-plus/src/main/java/com/qs/serve/mbp/query/annotations/QueryWrap.java
index 96cc08f..cf1cea8 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/framework/mybatis/query/annotations/QueryWrap.java
+++ b/cms-framework/cms-framework-mybatis-plus/src/main/java/com/qs/serve/mbp/query/annotations/QueryWrap.java
@@ -1,6 +1,6 @@
-package com.qs.serve.common.framework.mybatis.query.annotations;
+package com.qs.serve.mbp.query.annotations;
 
-import com.qs.serve.common.framework.mybatis.query.model.QueryType;
+import com.qs.serve.mbp.query.model.QueryType;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/framework/mybatis/query/model/QueryFieldData.java b/cms-framework/cms-framework-mybatis-plus/src/main/java/com/qs/serve/mbp/query/model/QueryFieldData.java
similarity index 84%
rename from cms-framework/src/main/java/com/qs/serve/common/framework/mybatis/query/model/QueryFieldData.java
rename to cms-framework/cms-framework-mybatis-plus/src/main/java/com/qs/serve/mbp/query/model/QueryFieldData.java
index 1654861..ae5f2e0 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/framework/mybatis/query/model/QueryFieldData.java
+++ b/cms-framework/cms-framework-mybatis-plus/src/main/java/com/qs/serve/mbp/query/model/QueryFieldData.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.framework.mybatis.query.model;
+package com.qs.serve.mbp.query.model;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/cms-framework/src/main/java/com/qs/serve/common/framework/mybatis/query/model/QueryFieldDataValue.java b/cms-framework/cms-framework-mybatis-plus/src/main/java/com/qs/serve/mbp/query/model/QueryFieldDataValue.java
similarity index 78%
rename from cms-framework/src/main/java/com/qs/serve/common/framework/mybatis/query/model/QueryFieldDataValue.java
rename to cms-framework/cms-framework-mybatis-plus/src/main/java/com/qs/serve/mbp/query/model/QueryFieldDataValue.java
index 718b176..8259df5 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/framework/mybatis/query/model/QueryFieldDataValue.java
+++ b/cms-framework/cms-framework-mybatis-plus/src/main/java/com/qs/serve/mbp/query/model/QueryFieldDataValue.java
@@ -1,6 +1,6 @@
-package com.qs.serve.common.framework.mybatis.query.model;
+package com.qs.serve.mbp.query.model;
 
-import com.qs.serve.common.util.CopierUtil;
+import com.qs.serve.common.utils.CopierUtil;
 import lombok.Getter;
 import lombok.Setter;
 
diff --git a/cms-framework/src/main/java/com/qs/serve/common/framework/mybatis/query/model/QueryType.java b/cms-framework/cms-framework-mybatis-plus/src/main/java/com/qs/serve/mbp/query/model/QueryType.java
similarity index 88%
rename from cms-framework/src/main/java/com/qs/serve/common/framework/mybatis/query/model/QueryType.java
rename to cms-framework/cms-framework-mybatis-plus/src/main/java/com/qs/serve/mbp/query/model/QueryType.java
index d32cd45..357921e 100644
--- a/cms-framework/src/main/java/com/qs/serve/common/framework/mybatis/query/model/QueryType.java
+++ b/cms-framework/cms-framework-mybatis-plus/src/main/java/com/qs/serve/mbp/query/model/QueryType.java
@@ -1,4 +1,4 @@
-package com.qs.serve.common.framework.mybatis.query.model;
+package com.qs.serve.mbp.query.model;
 
 /**
  * @author JcYen
diff --git a/cms-framework/cms-framework-security/pom.xml b/cms-framework/cms-framework-security/pom.xml
new file mode 100644
index 0000000..e27d5e7
--- /dev/null
+++ b/cms-framework/cms-framework-security/pom.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>cms-framework</artifactId>
+        <groupId>com.qs</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>cms-framework-security</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+</project>
diff --git a/cms-framework/pom.xml b/cms-framework/pom.xml
index a2eb0c0..7e3229e 100644
--- a/cms-framework/pom.xml
+++ b/cms-framework/pom.xml
@@ -9,7 +9,13 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <packaging>jar</packaging>
+    <packaging>pom</packaging>
+    <modules>
+        <module>cms-framework-mybatis-plus</module>
+        <module>cms-framework-security</module>
+        <module>cms-framework-mvc</module>
+        <module>cms-framework-base</module>
+    </modules>
     <artifactId>cms-framework</artifactId>
 
     <properties>
@@ -17,183 +23,5 @@
         <maven.compiler.target>8</maven.compiler.target>
     </properties>
 
-    <dependencies>
-
-        <dependency>
-            <groupId>com.qs</groupId>
-            <artifactId>cms-common</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-tomcat</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-undertow</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-aop</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-log4j2</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
-            <version>4.10.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>easyexcel</artifactId>
-            <version>3.3.2</version>
-        </dependency>
-
-
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-            <version>${hutool.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.auth0</groupId>
-            <artifactId>java-jwt</artifactId>
-            <version>${jwt.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-        </dependency>
-
-
-        <dependency>
-            <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper-spring-boot-starter</artifactId>
-            <version>1.4.4</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.mybatis</groupId>
-                    <artifactId>mybatis-spring</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.mybatis</groupId>
-                    <artifactId>mybatis</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
-            <version>${mybatis-plus.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>${mybatis-plus.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.15</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.microsoft.sqlserver</groupId>
-            <artifactId>mssql-jdbc</artifactId>
-            <version>8.4.1.jre8</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.12.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.github.binarywang</groupId>
-            <artifactId>weixin-java-mp</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.github.binarywang</groupId>
-            <artifactId>weixin-java-cp</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.tencentcloudapi</groupId>
-            <artifactId>tencentcloud-sdk-java</artifactId>
-            <version>3.1.598</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.github.shalousun</groupId>
-            <artifactId>smart-doc</artifactId>
-            <version>2.4.0</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.aliyun.oss</groupId>
-            <artifactId>aliyun-sdk-oss</artifactId>
-            <version>3.16.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-            <version>2.10</version>
-        </dependency>
-    </dependencies>
-
 
 </project>
diff --git a/cms-framework/src/main/java/com/qs/serve/common/framework/annotations/RedisCacheable.java b/cms-framework/src/main/java/com/qs/serve/common/framework/annotations/RedisCacheable.java
deleted file mode 100644
index c4acc8a..0000000
--- a/cms-framework/src/main/java/com/qs/serve/common/framework/annotations/RedisCacheable.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.qs.serve.common.framework.annotations;
-
-import java.lang.annotation.*;
-
-/**
- * 解决原有@CacheAble不支持独立失效策略场景
- * @author YenHex
- * @since 2024/10/17
- */
-@Target({ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface RedisCacheable {
-
-    /**
-     * redis缓存前缀，默认类与方法名
-     * @return
-     */
-    String prefix() default "";
-
-    /**
-     * 过期时间
-     * @return
-     */
-    int expire() default 350;
-
-    /**
-     * 缓存读取主键表达式
-     * @return
-     */
-    String expression() default "";
-
-    String SIMPLE_KEY = "#key";
-
-}
diff --git a/cms-framework/src/main/java/com/qs/serve/common/framework/annotations/TagField.java b/cms-framework/src/main/java/com/qs/serve/common/framework/annotations/TagField.java
deleted file mode 100644
index 53d4fec..0000000
--- a/cms-framework/src/main/java/com/qs/serve/common/framework/annotations/TagField.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.qs.serve.common.framework.annotations;
-
-public @interface TagField {
-}
diff --git a/cms-framework/src/main/java/com/qs/serve/common/framework/aop/RedisCacheAspect.java b/cms-framework/src/main/java/com/qs/serve/common/framework/aop/RedisCacheAspect.java
deleted file mode 100644
index f6cbc5e..0000000
--- a/cms-framework/src/main/java/com/qs/serve/common/framework/aop/RedisCacheAspect.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package com.qs.serve.common.framework.aop;
-
-import com.baomidou.mybatisplus.core.toolkit.StringPool;
-import com.qs.serve.common.framework.annotations.RedisCacheable;
-import com.qs.serve.common.framework.redis.RedisService;
-import com.qs.serve.common.util.JsonUtil;
-import com.qs.serve.common.util.StringUtils;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.Signature;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Pointcut;
-import org.aspectj.lang.reflect.MethodSignature;
-import org.springframework.core.annotation.AnnotatedElementUtils;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @author YenHex
- * @since 2024/10/18
- */
-@Slf4j
-//@Aspect
-//@Component
-@AllArgsConstructor
-public class RedisCacheAspect {
-
-    private final RedisService redisService;
-
-    @Pointcut("@annotation(com.qs.serve.common.framework.annotations.RedisCacheable)")
-    public void PointCut() {}
-
-    @Around("PointCut()")
-    public Object redisCacheAdvice(ProceedingJoinPoint joinPoint) throws Throwable {
-        Object[] args = joinPoint.getArgs();
-        Signature signature = joinPoint.getSignature();
-        MethodSignature methodSignature = ((MethodSignature) signature);
-        Method method = methodSignature.getMethod();
-        RedisCacheable redisCacheable = AnnotatedElementUtils.findMergedAnnotation(method, RedisCacheable.class);
-        if(redisCacheable!=null){
-            String prefix = StringUtils.hasText(redisCacheable.prefix()) ? redisCacheable.prefix()
-                    :  methodSignature.getDeclaringType().getName() +"."+ methodSignature.getMethod().getName()+"()";
-            //构建表达式key
-            String pk = this.getPrimaryKey(methodSignature,redisCacheable,args);
-            String redisCacheKey = "RCache:" + prefix + (pk==null?"":pk);
-            Object result = redisService.get(redisCacheKey);
-            if(result!=null){
-                return JsonUtil.jsonToMap(result.toString());
-            }
-            result = joinPoint.proceed(args);
-            if(result!=null){
-                redisService.set(redisCacheKey,JsonUtil.objectToJson(result),redisCacheable.expire(), TimeUnit.MILLISECONDS);
-            }
-            return result;
-        }
-        // 返回默认对象
-        return joinPoint.proceed(args);
-    }
-
-    public String getPrimaryKey(MethodSignature methodSignature,RedisCacheable annotation,Object[] args){
-        String method = methodSignature.getDeclaringType().getName()
-                +"."+ methodSignature.getMethod().getName()+"()";
-        final String expression = annotation.expression();
-        //适配表达式读取key，key读取不到log.error，放行请求
-        String primaryKey = null;
-        if(StringUtils.isNotEmpty(expression)){
-            //
-            if(expression.equals(RedisCacheable.SIMPLE_KEY)&&args.length==1){
-                return args[0].toString();
-            }
-            List<String> keys = new ArrayList<>();
-            // 指定表名
-            String tableName = null;
-            if(expression.contains(StringPool.DOT)){
-                String[] keyArr = expression.split(StringPool.BACK_SLASH + StringPool.DOT);
-                for (String key : keyArr) {
-                    if(key.contains(StringPool.DOLLAR)){
-                        tableName = key.replace(StringPool.DOLLAR,"");
-                        continue;
-                    }
-                    keys.add(key);
-                }
-            }else {
-                keys.add(expression);
-            }
-            for (Object arg : args) {
-                // 跳过非指定的表名
-                if(tableName!=null){
-                    String clazzName = arg.getClass().getSimpleName();
-                    if(!clazzName.equals(tableName)){
-                        continue;
-                    }
-                }
-                // 读取key
-                primaryKey = getPrimaryKeyRecursion(keys, arg, 0);
-            }
-            if(primaryKey==null){
-                log.error("LockSubmitAspect失效，方法：{} 无法读取主键：{}",method,expression);
-            }
-        }
-        return primaryKey;
-    }
-
-
-    /**
-     * 递归读取主键
-     * @param keys
-     * @param arg
-     * @param startIndex
-     * @return
-     */
-    private String getPrimaryKeyRecursion(List<String> keys, Object arg, int startIndex) {
-        String key = keys.get(startIndex);
-        Map<String,Object> param = JsonUtil.jsonToMap(JsonUtil.objectToJson(arg));
-        Object val = param.get(key);
-        if(val!=null){
-            boolean isLast = startIndex + 1== keys.size();
-            if(isLast){
-                return val.toString();
-            }else {
-                // 自调支持无限层级
-                return getPrimaryKeyRecursion(keys, val, startIndex + 1 );
-            }
-        }
-        return null;
-    }
-
-}
diff --git a/cms-framework/src/main/java/com/qs/serve/common/framework/mybatis/handler/IdGeneratorHandler.java b/cms-framework/src/main/java/com/qs/serve/common/framework/mybatis/handler/IdGeneratorHandler.java
deleted file mode 100644
index 59b3b7a..0000000
--- a/cms-framework/src/main/java/com/qs/serve/common/framework/mybatis/handler/IdGeneratorHandler.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.qs.serve.common.framework.mybatis.handler;
-
-import com.baomidou.mybatisplus.core.incrementer.DefaultIdentifierGenerator;
-import com.qs.serve.common.util.NanoIdUtils;
-
-/**
- * @author YenHex
- * @since 2022/4/11
- */
-public class IdGeneratorHandler extends DefaultIdentifierGenerator {
-
-    @Override
-    public String nextUUID(Object entity) {
-        return NanoIdUtils.randomNanoId();
-    }
-
-}
diff --git a/cms-framework/src/main/java/com/qs/serve/common/framework/mybatis/join/JoinUtil.java b/cms-framework/src/main/java/com/qs/serve/common/framework/mybatis/join/JoinUtil.java
deleted file mode 100644
index 4e14619..0000000
--- a/cms-framework/src/main/java/com/qs/serve/common/framework/mybatis/join/JoinUtil.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package com.qs.serve.common.framework.mybatis.join;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.qs.serve.common.framework.mybatis.join.annotations.BindEntity;
-import com.qs.serve.common.framework.mybatis.join.enums.JoinType;
-import com.qs.serve.common.framework.mybatis.join.model.JoinFieldData;
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.common.util.SpringUtils;
-import com.qs.serve.common.util.WordUtil;
-import lombok.extern.slf4j.Slf4j;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * @author YenHex
- * @since 2022/5/24
- */
-@Slf4j
-public class JoinUtil {
-
-    private static Map<String, List<JoinFieldData>> CACHE_MAP = new ConcurrentHashMap<>();
-
-    private static List<JoinFieldData> getJoinFields(List<?> list) {
-        if(CollectionUtil.isEmpty(list)){
-            return new ArrayList<>();
-        }
-        String className = list.get(0).getClass().getName();
-        List<JoinFieldData> joinFieldDataList = new ArrayList<>();
-        Class<?> clazz = null;
-        try {
-            clazz = Class.forName(className);
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-        if(clazz==null){return null;}
-        Field[] fields = clazz.getDeclaredFields();
-        Field fieldJoinVal = null;
-        Field fieldSetVal = null;
-        BindEntity bindEntity = null;
-        for (Field field : fields) {
-            for (Annotation annotation : field.getAnnotations()) {
-                if(annotation instanceof BindEntity){
-                    fieldSetVal = field;
-                    bindEntity = (BindEntity) annotation;
-                    break;
-                }
-            }
-        }
-        if(fieldSetVal!=null){
-            for (Field field :fields){
-                if(field.getName().equals(bindEntity.joinField())){
-                    fieldJoinVal = field;
-                    break;
-                }
-            }
-        }
-        if(bindEntity!=null&&fieldJoinVal!=null){
-            JoinFieldData fieldData = new JoinFieldData();
-            fieldData.setFieldJoinVal(fieldJoinVal);
-            fieldData.setBindEntity(bindEntity);
-            fieldData.setFieldSetVal(fieldSetVal);
-            joinFieldDataList.add(fieldData);
-        }
-        CACHE_MAP.put(className,joinFieldDataList);
-        return joinFieldDataList;
-    }
-
-    public static void relate(List<?> list) {
-        List<JoinFieldData> joinFieldData = getJoinFields(list);
-        HashMap<String,Object> tempCache = new HashMap<>(list.size()+1);
-        for (JoinFieldData fieldData : joinFieldData) {
-            for (Object object : list) {
-                try {
-                    Field fieldJoinVal = fieldData.getFieldJoinVal();
-                    Field fieldSetVal = fieldData.getFieldSetVal();
-                    BindEntity bindEntity = fieldData.getBindEntity();
-                    fieldSetVal.setAccessible(true);
-                    fieldJoinVal.setAccessible(true);
-                    IService<?> iService = SpringUtils.getBean(bindEntity.service());
-                    Object identity = fieldJoinVal.get(object);
-                    if(identity==null){
-                        continue;
-                    }
-                    Object result = tempCache.get(identity.toString());
-                    if(result!=null){
-                        fieldSetVal.set(object,result);
-                        continue;
-                    }
-                    if(bindEntity.joinType()== JoinType.List){
-                        QueryWrapper wrapper = new QueryWrapper<>();
-                        wrapper.eq(WordUtil.toLine(bindEntity.joinField()),identity);
-                        result = iService.list(wrapper);
-                    }else {
-                        QueryWrapper wrapper = new QueryWrapper();
-                        wrapper.eq(WordUtil.toLine(bindEntity.selfField()),identity);
-                        result = iService.getOne(wrapper,false);
-                    }
-                    fieldSetVal.set(object,result);
-                    tempCache.put(identity.toString(),result);
-                } catch (IllegalAccessException e) {
-                    log.warn("join 工具失败：",e);
-                }
-            }
-        }
-        tempCache = null;
-    }
-
-}
diff --git a/cms-framework/src/main/java/com/qs/serve/common/framework/mybatis/join/annotations/BindEntity.java b/cms-framework/src/main/java/com/qs/serve/common/framework/mybatis/join/annotations/BindEntity.java
deleted file mode 100644
index 887fa1e..0000000
--- a/cms-framework/src/main/java/com/qs/serve/common/framework/mybatis/join/annotations/BindEntity.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.qs.serve.common.framework.mybatis.join.annotations;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.qs.serve.common.framework.mybatis.join.enums.JoinType;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * 实现left join
- * @author YenHex
- * @since 2022/5/24
- */
-@Target({ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface BindEntity {
-
-    Class<? extends IService> service();
-
-    /**
-     * 关联的表
-     * @return
-     */
-    String joinField() default  "";
-
-    /**
-     * 主表
-     * @return
-     */
-    String selfField() default  "id";
-
-    JoinType joinType() default JoinType.Object;
-
-}
diff --git a/cms-framework/src/main/java/com/qs/serve/common/framework/mybatis/join/enums/JoinType.java b/cms-framework/src/main/java/com/qs/serve/common/framework/mybatis/join/enums/JoinType.java
deleted file mode 100644
index df49269..0000000
--- a/cms-framework/src/main/java/com/qs/serve/common/framework/mybatis/join/enums/JoinType.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.qs.serve.common.framework.mybatis.join.enums;
-
-/**
- * @author YenHex
- * @since 2022/5/24
- */
-public enum JoinType {
-
-    /**
-     * 返回类型
-     */
-    Object,List
-
-}
diff --git a/cms-framework/src/main/java/com/qs/serve/common/framework/mybatis/join/model/JoinFieldData.java b/cms-framework/src/main/java/com/qs/serve/common/framework/mybatis/join/model/JoinFieldData.java
deleted file mode 100644
index 6d87537..0000000
--- a/cms-framework/src/main/java/com/qs/serve/common/framework/mybatis/join/model/JoinFieldData.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.qs.serve.common.framework.mybatis.join.model;
-
-import com.qs.serve.common.framework.mybatis.join.annotations.BindEntity;
-import lombok.Data;
-
-import java.lang.reflect.Field;
-
-/**
- * @author YenHex
- * @since 2022/5/24
- */
-@Data
-public class JoinFieldData {
-    Field fieldJoinVal;
-    Field fieldSetVal;
-    BindEntity bindEntity;
-}
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/consts/DateConst.java b/cms-framework/src/main/java/com/qs/serve/common/model/consts/DateConst.java
deleted file mode 100644
index 6cf1d01..0000000
--- a/cms-framework/src/main/java/com/qs/serve/common/model/consts/DateConst.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.qs.serve.common.model.consts;
-
-/**
- * @author YenHex
- * @since 2022/2/24
- */
-public class DateConst {
-
-
-}
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/consts/RedisListenerKeys.java b/cms-framework/src/main/java/com/qs/serve/common/model/consts/RedisListenerKeys.java
deleted file mode 100644
index 26b244d..0000000
--- a/cms-framework/src/main/java/com/qs/serve/common/model/consts/RedisListenerKeys.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.qs.serve.common.model.consts;
-
-/**
- * @author YenHex
- * @since 2022/3/1
- */
-public class RedisListenerKeys {
-
-    public final static String EXPIRED_TYPE = "__keyevent@*__:expired";
-
-
-}
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/consts/ResultFlag.java b/cms-framework/src/main/java/com/qs/serve/common/model/consts/ResultFlag.java
deleted file mode 100644
index 2641b44..0000000
--- a/cms-framework/src/main/java/com/qs/serve/common/model/consts/ResultFlag.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.qs.serve.common.model.consts;
-
-/**
- * @author YenHex
- * @since 2023/2/15
- */
-public interface ResultFlag {
-
-    int OK = 1;
-    int NOT = 0;
-
-}
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/group/EditGroup.java b/cms-framework/src/main/java/com/qs/serve/common/model/group/EditGroup.java
deleted file mode 100644
index e2fab74..0000000
--- a/cms-framework/src/main/java/com/qs/serve/common/model/group/EditGroup.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.qs.serve.common.model.group;
-
-/**
- * @author YenHex
- * @since 2022/5/16
- */
-public interface EditGroup {
-}
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/group/SaveGroup.java b/cms-framework/src/main/java/com/qs/serve/common/model/group/SaveGroup.java
deleted file mode 100644
index e83376a..0000000
--- a/cms-framework/src/main/java/com/qs/serve/common/model/group/SaveGroup.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.qs.serve.common.model.group;
-
-/**
- * @author YenHex
- * @since 2022/5/16
- */
-public interface SaveGroup {
-}
diff --git a/cms-framework/src/main/java/com/qs/serve/common/model/group/SearchGroup.java b/cms-framework/src/main/java/com/qs/serve/common/model/group/SearchGroup.java
deleted file mode 100644
index 2ddbdd2..0000000
--- a/cms-framework/src/main/java/com/qs/serve/common/model/group/SearchGroup.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.qs.serve.common.model.group;
-
-/**
- * @author YenHex
- * @since 2022/5/16
- */
-public interface SearchGroup {
-}
diff --git a/cms-framework/src/main/java/com/qs/serve/common/util/WarpUtil.java b/cms-framework/src/main/java/com/qs/serve/common/util/WarpUtil.java
deleted file mode 100644
index 94b6481..0000000
--- a/cms-framework/src/main/java/com/qs/serve/common/util/WarpUtil.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.qs.serve.common.util;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.qs.serve.common.framework.mybatis.query.AnnotationQueryStorage;
-import com.qs.serve.common.framework.mybatis.query.model.QueryFieldDataValue;
-import lombok.experimental.UtilityClass;
-import lombok.extern.slf4j.Slf4j;
-
-import java.util.List;
-
-/**
- * 生成SQL条件包装对象
- * @author YenHex
- * @date  2022/2/28
- **/
-@UtilityClass
-@Slf4j
-public class WarpUtil extends AnnotationQueryStorage {
-
-    private static final String ORDER_PROP_NAME = "prop";
-    private static final String ORDER_TYPE_NAME = "order";
-    private static final String ORDER_DESC = "desc";
-    private static final String CREATE_TIME = "create_time";
-
-    private static final String START_TIME = "startTime";
-    private static final String END_TIME = "endTime";
-
-    public static <T> QueryWrapper<T> build(T query){
-        return build(query,false);
-    }
-
-    public static <T> QueryWrapper<T> build(T query,Boolean orderAble){
-        QueryWrapper<T> queryWrapper = new QueryWrapper<>();
-        List<QueryFieldDataValue> dataValues = loadQueryFieldDataValues(query);
-        assert dataValues != null;
-        initWrap(dataValues,queryWrapper);
-        initBetweenTime(queryWrapper);
-        if(orderAble){
-            String columnsString = ServletUtils.getParameter(ORDER_PROP_NAME);
-            String orderType = ServletUtils.getParameter(ORDER_TYPE_NAME);
-            if(StringUtils.isNotEmpty(columnsString)){
-                String[] columns = columnsString.split(",");
-//                if(orderType.equals(ORDER_DESC)){
-//                    queryWrapper.orderByDesc(columns);
-//                }else {
-//                    queryWrapper.orderByAsc(columns);
-//                }
-            }
-        }
-        return queryWrapper;
-    }
-
-    public static void initBetweenTime(QueryWrapper<?> queryWrapper){
-        String startTime = ServletUtils.getParameter(START_TIME);
-        String endTime = ServletUtils.getParameter(END_TIME);
-        if(!StringUtils.hasEmpty(startTime,endTime)){
-            queryWrapper.ge(CREATE_TIME,startTime);
-            queryWrapper.le(CREATE_TIME,endTime);
-        }
-    }
-
-}
diff --git a/cms-framework/src/main/java/com/qs/serve/framework/package-info.java b/cms-framework/src/main/java/com/qs/serve/framework/package-info.java
deleted file mode 100644
index c39a24c..0000000
--- a/cms-framework/src/main/java/com/qs/serve/framework/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.qs.serve.framework;
diff --git a/cms-framework/src/main/java/com/qs/serve/framework/support/package-info.java b/cms-framework/src/main/java/com/qs/serve/framework/support/package-info.java
deleted file mode 100644
index 6d02305..0000000
--- a/cms-framework/src/main/java/com/qs/serve/framework/support/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.qs.serve.framework.support;
diff --git a/cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/HttpServletRequestFilter.java b/cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/HttpServletRequestFilter.java
index 185618d..311dd8c 100644
--- a/cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/HttpServletRequestFilter.java
+++ b/cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/HttpServletRequestFilter.java
@@ -1,10 +1,10 @@
 package com.qs.serve.actuator;
 
-import com.qs.serve.common.config.DevEnvironmentConfig;
-import com.qs.serve.common.framework.redis.RedisService;
-import com.qs.serve.common.framework.security.model.LoginUser;
-import com.qs.serve.common.util.DateUtils;
-import com.qs.serve.common.util.ServletUtils;
+import com.qs.serve.framework.base.config.DevEnvironmentConfig;
+import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.framework.base.framework.security.model.LoginUser;
+import com.qs.serve.framework.base.util.DateUtils;
+import com.qs.serve.common.utils.ServletUtils;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.annotation.Order;
diff --git a/cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/SecurityConfig.java b/cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/SecurityConfig.java
index f30da38..97233ff 100644
--- a/cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/SecurityConfig.java
+++ b/cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/SecurityConfig.java
@@ -1,7 +1,7 @@
 package com.qs.serve.actuator;
 
-import com.qs.serve.common.config.properties.PermitProperties;
-import com.qs.serve.common.framework.security.handler.SecurityAccessDeniedHandler;
+import com.qs.serve.framework.base.config.properties.PermitProperties;
+import com.qs.serve.framework.base.framework.security.handler.SecurityAccessDeniedHandler;
 import lombok.AllArgsConstructor;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpMethod;
diff --git a/cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/SecurityLogoutHandler.java b/cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/SecurityLogoutHandler.java
index cb3acd5..374273f 100644
--- a/cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/SecurityLogoutHandler.java
+++ b/cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/SecurityLogoutHandler.java
@@ -1,6 +1,6 @@
 package com.qs.serve.actuator;
 
-import com.qs.serve.common.model.HttpResponsePrintUtil;
+import com.qs.serve.framework.base.model.HttpResponsePrintUtil;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.web.authentication.logout.LogoutHandler;
 
diff --git a/cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/SecurityRequestFilter.java b/cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/SecurityRequestFilter.java
index e7c29a7..5a1db62 100644
--- a/cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/SecurityRequestFilter.java
+++ b/cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/SecurityRequestFilter.java
@@ -1,16 +1,16 @@
 package com.qs.serve.actuator;
 
-import com.qs.serve.common.config.properties.AuthUrlConst;
-import com.qs.serve.common.config.properties.PermitProperties;
-import com.qs.serve.common.config.properties.ProjectProperties;
-import com.qs.serve.common.framework.redis.RedisService;
-import com.qs.serve.common.framework.security.model.LoginUser;
-import com.qs.serve.common.framework.security.util.SecurityPermitUtil;
-import com.qs.serve.common.model.HttpResponsePrintUtil;
-import com.qs.serve.common.model.consts.GySysConst;
-import com.qs.serve.common.model.consts.RedisCacheKeys;
+import com.qs.serve.framework.base.config.properties.AuthUrlConst;
+import com.qs.serve.framework.base.config.properties.PermitProperties;
+import com.qs.serve.framework.base.config.properties.ProjectProperties;
+import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.framework.base.framework.security.model.LoginUser;
+import com.qs.serve.framework.base.framework.security.util.SecurityPermitUtil;
+import com.qs.serve.framework.base.model.HttpResponsePrintUtil;
+import com.qs.serve.framework.base.model.consts.GySysConst;
+import com.qs.serve.framework.base.model.consts.RedisCacheKeys;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.JwtUtils;
+import com.qs.serve.framework.base.util.JwtUtils;
 import com.qs.serve.modules.sys.service.SysUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -157,7 +157,7 @@ public class SecurityRequestFilter extends OncePerRequestFilter {
             String userType = JwtUtils.getUserType(token);
             String client = JwtUtils.getClient(token);
             if(checkRedis){
-                String redisKey = com.qs.serve.common.util.StringUtils.format(RedisCacheKeys.LOGIN_KEY_APP,client,userId);
+                String redisKey = com.qs.serve.common.utils.StringUtils.format(RedisCacheKeys.LOGIN_KEY_APP,client,userId);
                 String cacheToken = redisService.getString(redisKey);
                 if(cacheToken==null){
                     //redisService.remove(redisKey);
diff --git a/cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/SysLogAspect.java b/cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/SysLogAspect.java
index b9578f0..3c9bd94 100644
--- a/cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/SysLogAspect.java
+++ b/cms-modules/cms-actuator/src/main/java/com/qs/serve/actuator/SysLogAspect.java
@@ -1,13 +1,13 @@
 package com.qs.serve.actuator;
 
 import com.alibaba.fastjson.JSON;
-import com.qs.serve.common.framework.manager.AsyncManager;
-import com.qs.serve.common.framework.security.model.LoginUser;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.consts.GySysConst;
+import com.qs.serve.framework.base.framework.manager.AsyncManager;
+import com.qs.serve.framework.base.framework.security.model.LoginUser;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.consts.GySysConst;
 import com.qs.serve.modules.sync.AsyncFactory;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.ServletUtils;
+import com.qs.serve.common.utils.ServletUtils;
 import com.qs.serve.modules.sys.entity.SysOperationLog;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.sys.service.SysUserService;
@@ -46,10 +46,10 @@ public class SysLogAspect {
 
     ThreadLocal<Long> startTimeIndex = new ThreadLocal<>();
 
-    @Pointcut("@annotation(com.qs.serve.common.model.annotation.SysLog)")
+    @Pointcut("@annotation(com.qs.serve.common.annotation.SysLog)")
     public void logPointCut() {}
 
-    @Before("@annotation(com.qs.serve.common.model.annotation.SysLog)")
+    @Before("@annotation(com.qs.serve.common.annotation.SysLog)")
     public void doBefore() {
         startTimeIndex.set(System.currentTimeMillis());
     }
diff --git a/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcRebateCenterParam.java b/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcRebateCenterParam.java
index 79abfc4..08bd22d 100644
--- a/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcRebateCenterParam.java
+++ b/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcRebateCenterParam.java
@@ -8,6 +8,7 @@ import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.DecimalMin;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
@@ -24,10 +25,12 @@ public class TzcRebateCenterParam implements Serializable {
 
     /** 费用额度 */
     @NotNull(message = "费用额度不能为空")
+    @DecimalMin(value = "0", message = "费用额度不能是负数")
     private BigDecimal centerAmount;
 
     /** 费用占比 */
     @NotNull(message = "费用占比不能为空")
+    @DecimalMin(value = "0", message = "费用占比不能是负数")
     private BigDecimal centerRate;
 
     /** 成本中心类型 */
diff --git a/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcRebateParam.java b/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcRebateParam.java
index 6774064..34000ee 100644
--- a/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcRebateParam.java
+++ b/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcRebateParam.java
@@ -77,7 +77,7 @@ public class TzcRebateParam{
     /**
      * 科目列表(内含成本中心列表)
      */
-    private List<TzcRebateSubject> subjectList;
+    private List<TzcRebateSubjectParam> subjectList;
 
     /**
      * 期间列表
diff --git a/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcRebatePeriodParam.java b/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcRebatePeriodParam.java
index 905d294..6c40e70 100644
--- a/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcRebatePeriodParam.java
+++ b/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcRebatePeriodParam.java
@@ -10,6 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -28,15 +29,13 @@ public class TzcRebatePeriodParam implements Serializable {
 
     /** 开始时间 */
     @Length(max = 0,message = "开始时间长度不能超过0字")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    private LocalDateTime periodStartDate;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate periodStartDate;
 
     /** 结束时间 */
     @Length(max = 0,message = "结束时间长度不能超过0字")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    private LocalDateTime periodEndDate;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate periodEndDate;
 
     /** 区间目标金额 */
     private BigDecimal periodAmount;
@@ -44,7 +43,9 @@ public class TzcRebatePeriodParam implements Serializable {
     /** 同期进货金额 */
     private BigDecimal samePeriodAmount;
 
-    /** 总目标达标补偿 */
+    /** 总目标达标补偿
+     * compensationFlag=1时，argumentParam不能为空
+     */
     private Integer compensationFlag;
 
     /**
diff --git a/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcRebateSubjectParam.java b/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcRebateSubjectParam.java
index 9ed146a..98d16a0 100644
--- a/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcRebateSubjectParam.java
+++ b/cms-modules/cms-policy/cms-policy-api/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcRebateSubjectParam.java
@@ -30,7 +30,7 @@ public class TzcRebateSubjectParam implements Serializable {
     @NotNull(message = "科目id不能为空")
     private Long subjectId;
 
-    /** 科目比例 */
+    /** 科目比例，百分位。如70%，subjectRate=70 */
     @DecimalMin(value = "0", message = "科目比例不能是负数")
     private BigDecimal subjectRate;
 
diff --git a/cms-modules/cms-policy/cms-policy-bus/pom.xml b/cms-modules/cms-policy/cms-policy-bus/pom.xml
index 15f05ca..9c86078 100644
--- a/cms-modules/cms-policy/cms-policy-bus/pom.xml
+++ b/cms-modules/cms-policy/cms-policy-bus/pom.xml
@@ -25,7 +25,12 @@
         </dependency>
         <dependency>
             <groupId>com.qs</groupId>
-            <artifactId>cms-framework</artifactId>
+            <artifactId>cms-framework-mybatis-plus</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.qs</groupId>
+            <artifactId>cms-common</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
diff --git a/cms-modules/cms-policy/cms-policy-bus/src/main/java/com/qs/serve/modules/tzc/controller/TzcRebateController.java b/cms-modules/cms-policy/cms-policy-bus/src/main/java/com/qs/serve/modules/tzc/controller/TzcRebateController.java
index 063e1e7..f841b4a 100644
--- a/cms-modules/cms-policy/cms-policy-bus/src/main/java/com/qs/serve/modules/tzc/controller/TzcRebateController.java
+++ b/cms-modules/cms-policy/cms-policy-bus/src/main/java/com/qs/serve/modules/tzc/controller/TzcRebateController.java
@@ -1,17 +1,16 @@
 package com.qs.serve.modules.tzc.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import com.qs.serve.modules.tzc.entity.TzcRebate;
diff --git a/cms-modules/cms-policy/cms-policy-bus/src/main/java/com/qs/serve/modules/tzc/service/TzcRebateApplicationService.java b/cms-modules/cms-policy/cms-policy-bus/src/main/java/com/qs/serve/modules/tzc/service/TzcRebateApplicationService.java
index 466b9f3..05ed14b 100644
--- a/cms-modules/cms-policy/cms-policy-bus/src/main/java/com/qs/serve/modules/tzc/service/TzcRebateApplicationService.java
+++ b/cms-modules/cms-policy/cms-policy-bus/src/main/java/com/qs/serve/modules/tzc/service/TzcRebateApplicationService.java
@@ -2,6 +2,7 @@ package com.qs.serve.modules.tzc.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qs.serve.modules.tzc.entity.TzcRebate;
+import com.qs.serve.modules.tzc.entity.bo.TzcRebateParam;
 
 /**
  * 返利信息 服务接口
@@ -10,5 +11,18 @@ import com.qs.serve.modules.tzc.entity.TzcRebate;
  */
 public interface TzcRebateApplicationService {
 
+    /**
+     * 编辑返利实体类
+     * @param param
+     * @return
+     */
+    Object modifyRebate(TzcRebateParam param);
+
+    /**
+     * 提交返利到OA
+     * @param id
+     */
+    void commitRebate(Long id);
+
 }
 
diff --git a/cms-modules/cms-policy/cms-policy-bus/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcRebateApplicationServiceImpl.java b/cms-modules/cms-policy/cms-policy-bus/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcRebateApplicationServiceImpl.java
index 13a5070..df6904a 100644
--- a/cms-modules/cms-policy/cms-policy-bus/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcRebateApplicationServiceImpl.java
+++ b/cms-modules/cms-policy/cms-policy-bus/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcRebateApplicationServiceImpl.java
@@ -1,10 +1,19 @@
 package com.qs.serve.modules.tzc.service.impl;
 
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.model.ResultFlag;
+import com.qs.serve.modules.tzc.entity.bo.TzcRebateCenterParam;
+import com.qs.serve.modules.tzc.entity.bo.TzcRebateParam;
+import com.qs.serve.modules.tzc.entity.bo.TzcRebatePeriodParam;
+import com.qs.serve.modules.tzc.entity.bo.TzcRebateSubjectParam;
 import com.qs.serve.modules.tzc.service.TzcRebateApplicationService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.util.List;
+
 /**
  * @author YenHex
  * @since 2025/4/16
@@ -14,6 +23,70 @@ import org.springframework.stereotype.Service;
 @AllArgsConstructor
 public class TzcRebateApplicationServiceImpl implements TzcRebateApplicationService {
 
+    @Override
+    public Object modifyRebate(TzcRebateParam param) {
+        BigDecimal oneHundred = new BigDecimal(100);
+        List<TzcRebateSubjectParam> subjectParamList = param.getSubjectList();
+        BigDecimal totalRate = BigDecimal.ZERO;
+        BigDecimal totalAmount = BigDecimal.ZERO;
+        for (TzcRebateSubjectParam subjectParam : subjectParamList) {
+
+            List<TzcRebateCenterParam> centerParamList = subjectParam.getCenterList();
+            BigDecimal totalCenterRate = BigDecimal.ZERO;
+            BigDecimal totalCenterAmount = BigDecimal.ZERO;
+            for (TzcRebateCenterParam centerParam : centerParamList) {
+                if(centerParam.getCenterRate().compareTo(BigDecimal.ZERO)<0){
+                    Assert.throwEx("成本中心占比不能小于0");
+                }
+                if(centerParam.getCenterAmount().compareTo(BigDecimal.ZERO)<0){
+                    Assert.throwEx("成本中心额度不能小于0");
+                }
+                totalCenterRate = totalCenterRate.add(centerParam.getCenterRate());
+                totalCenterAmount = totalCenterAmount.add(centerParam.getCenterAmount());
+            }
+            if(totalCenterRate.compareTo(oneHundred)!=0){
+                Assert.throwEx("科目的成本中心合计占比异常，当前："+totalCenterRate+"%");
+            }
+            if(totalCenterAmount.compareTo(subjectParam.getSubjectAmount())!=0){
+                Assert.throwEx("科目的成本中心合计计必须为返利科目额度"+totalCenterAmount+"元");
+            }
+            if(subjectParam.getSubjectRate().compareTo(BigDecimal.ZERO)<0){
+                Assert.throwEx("科目占比不能小于0");
+            }
+            if(subjectParam.getSubjectAmount().compareTo(BigDecimal.ZERO)<0){
+                Assert.throwEx("科目额度不能小于0");
+            }
+            totalRate = totalRate.add(subjectParam.getSubjectRate());
+            totalAmount = totalAmount.add(subjectParam.getSubjectAmount());
+
+        }
+        if(totalRate.compareTo(oneHundred)!=0){
+            Assert.throwEx("科目占比合计["+totalRate+"%]不为100%");
+        }
+        if(totalAmount.compareTo(param.getRebateAmount())!=0){
+            Assert.throwEx("科目额度合计异常金额："+totalAmount+"元");
+        }
+
+        List<TzcRebatePeriodParam> periodList = param.getPeriodList();
+        for (int i = 0; i < periodList.size(); i++) {
+            TzcRebatePeriodParam period = periodList.get(i);
+            for (int j = i + 1; j < periodList.size(); j++) {
+                TzcRebatePeriodParam period2 = periodList.get(j);
+                if (period.getPeriodEndDate().compareTo(period2.getPeriodStartDate()) >= 0
+                        && period.getPeriodStartDate().compareTo(period2.getPeriodEndDate()) <= 0) {
+                    Assert.throwEx("["+period.getPeriodTitle()+"]与["+period2.getPeriodTitle()+"],时间段存在交集");
+                }
+            }
+            if(ResultFlag.isTrue(period.getCompensationFlag())){
+
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public void commitRebate(Long id) {
 
+    }
 
 }
diff --git a/cms-modules/cms-system/pom.xml b/cms-modules/cms-system/pom.xml
index bfaae73..b1d5410 100644
--- a/cms-modules/cms-system/pom.xml
+++ b/cms-modules/cms-system/pom.xml
@@ -20,7 +20,12 @@
     <dependencies>
         <dependency>
             <groupId>com.qs</groupId>
-            <artifactId>cms-framework</artifactId>
+            <artifactId>cms-framework-mybatis-plus</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.qs</groupId>
+            <artifactId>cms-framework-base</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/base/ErpDataBaseService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/base/ErpDataBaseService.java
index e96802d..75c0e7c 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/base/ErpDataBaseService.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/base/ErpDataBaseService.java
@@ -1,16 +1,12 @@
 package com.qs.serve.modules.base;
 
-import cn.hutool.crypto.digest.DigestUtil;
-import com.qs.serve.common.config.properties.QiShengDsProperties;
-import com.qs.serve.common.util.HttpUtil;
+import com.qs.serve.framework.base.config.properties.QiShengDsProperties;
+import com.qs.serve.framework.base.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
 
 /**
  * @author YenHex
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/base/TianYiYunSmsService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/base/TianYiYunSmsService.java
index ac60cc6..c8b8646 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/base/TianYiYunSmsService.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/base/TianYiYunSmsService.java
@@ -1,7 +1,7 @@
 package com.qs.serve.modules.base;
 
 import cn.hutool.crypto.digest.DigestUtil;
-import com.qs.serve.common.util.HttpUtil;
+import com.qs.serve.framework.base.util.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/base/controller/JslApiController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/base/controller/JslApiController.java
index 77e40bd..a0ded2e 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/base/controller/JslApiController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/base/controller/JslApiController.java
@@ -2,11 +2,11 @@ package com.qs.serve.modules.base.controller;
 
 import cn.hutool.crypto.SecureUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.consts.GySysConst;
-import com.qs.serve.common.model.dto.R;
+import com.qs.serve.framework.base.model.consts.GySysConst;
+import com.qs.serve.framework.base.model.R;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.ValidateTools;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.framework.base.util.ValidateTools;
 import com.qs.serve.modules.bms.entity.bo.BmsSupplierBatchBo;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
 import com.qs.serve.modules.goods.entity.bo.GoodsSpuBatchTasteBo;
@@ -91,7 +91,7 @@ public class JslApiController {
             }else {
                 sysUserService.updateById(param);
             }
-//            if(param.getId()!=null&& com.qs.serve.common.util.CollectionUtil.isNotEmpty(userBo.getRoleIds())){
+//            if(param.getId()!=null&& com.qs.serve.framework.base.util.CollectionUtil.isNotEmpty(userBo.getRoleIds())){
 //                sysRoleService.saveUserRole4Edit(userBo.getRoleIds(),param.getId());
 //            }
         }
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/baz/controller/BazVisitController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/baz/controller/BazVisitController.java
index 72bbd9c..b152222 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/baz/controller/BazVisitController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/baz/controller/BazVisitController.java
@@ -1,14 +1,13 @@
 package com.qs.serve.modules.baz.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.baz.entity.BazVisitFlow;
 import com.qs.serve.modules.baz.service.BazVisitFlowService;
 import com.qs.serve.modules.bms.entity.BmsSupplierVisitForm;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/baz/controller/BazVisitFlowController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/baz/controller/BazVisitFlowController.java
index 4628a1b..3182136 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/baz/controller/BazVisitFlowController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/baz/controller/BazVisitFlowController.java
@@ -1,20 +1,19 @@
 package com.qs.serve.modules.baz.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.baz.entity.bo.BazVisitFlowSortBo;
 import com.qs.serve.modules.bms.entity.BmsSupplierVisitForm;
 import com.qs.serve.modules.bms.service.BmsSupplierVisitFormService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import com.qs.serve.modules.baz.entity.so.BazVisitFlowSo;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/baz/controller/BazVisitInstanceController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/baz/controller/BazVisitInstanceController.java
index a83d655..b4b0150 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/baz/controller/BazVisitInstanceController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/baz/controller/BazVisitInstanceController.java
@@ -1,14 +1,14 @@
 package com.qs.serve.modules.baz.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.baz.entity.BazVisitInstanceFlow;
 import com.qs.serve.modules.baz.service.BazVisitInstanceFlowService;
 import lombok.AllArgsConstructor;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/baz/controller/my/BazMyVisitInstanceController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/baz/controller/my/BazMyVisitInstanceController.java
index a36d586..3819eec 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/baz/controller/my/BazMyVisitInstanceController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/baz/controller/my/BazMyVisitInstanceController.java
@@ -1,12 +1,14 @@
 package com.qs.serve.modules.baz.controller.my;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.baz.entity.BazVisit;
 import com.qs.serve.modules.baz.entity.BazVisitInstance;
 import com.qs.serve.modules.baz.entity.bo.BazCreateVisitInstanceBo;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/baz/entity/BazVisitInstance.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/baz/entity/BazVisitInstance.java
index 6a872a0..77bc091 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/baz/entity/BazVisitInstance.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/baz/entity/BazVisitInstance.java
@@ -1,15 +1,13 @@
 package com.qs.serve.modules.baz.entity;
 
-import java.time.LocalDate;
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.qs.serve.common.model.dto.TargetDTO;
+import com.qs.serve.framework.base.model.dto.TargetDTO;
 import com.qs.serve.modules.baz.entity.bo.BazVisitInstanceFlowBo;
 import com.qs.serve.modules.sys.entity.SysUser;
 import lombok.Data;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/baz/entity/BazVisitInstanceFlow.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/baz/entity/BazVisitInstanceFlow.java
index 32293a5..5f12b20 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/baz/entity/BazVisitInstanceFlow.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/baz/entity/BazVisitInstanceFlow.java
@@ -1,16 +1,14 @@
 package com.qs.serve.modules.baz.entity;
 
-import java.time.LocalDate;
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
-import com.qs.serve.common.model.dto.TargetDTO;
+import com.qs.serve.mbp.handler.SplitStringTypeHandler;
+import com.qs.serve.framework.base.model.dto.TargetDTO;
 import com.qs.serve.modules.baz.entity.bo.BazVisitInstanceFlowBo;
 import com.qs.serve.modules.sys.entity.SysUser;
 import lombok.Data;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/baz/service/impl/BazVisitFlowServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/baz/service/impl/BazVisitFlowServiceImpl.java
index d15e246..f54ea3d 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/baz/service/impl/BazVisitFlowServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/baz/service/impl/BazVisitFlowServiceImpl.java
@@ -2,12 +2,10 @@ package com.qs.serve.modules.baz.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.util.Assert;
+import com.qs.serve.common.exception.Assert;
 import com.qs.serve.modules.baz.entity.BazVisit;
 import com.qs.serve.modules.baz.entity.bo.BazVisitFlowBo;
 import com.qs.serve.modules.baz.mapper.BazVisitMapper;
-import com.qs.serve.modules.biz.mapper.BizVisitMapper;
-import com.qs.serve.modules.biz.service.BizVisitService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/baz/service/impl/BazVisitInstanceServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/baz/service/impl/BazVisitInstanceServiceImpl.java
index 381feee..dcb9a92 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/baz/service/impl/BazVisitInstanceServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/baz/service/impl/BazVisitInstanceServiceImpl.java
@@ -2,10 +2,10 @@ package com.qs.serve.modules.baz.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.model.dto.TargetDTO;
-import com.qs.serve.common.util.Assert;
+import com.qs.serve.framework.base.model.dto.TargetDTO;
+import com.qs.serve.common.exception.Assert;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.baz.common.BazTargetTypeConsts;
 import com.qs.serve.modules.baz.entity.*;
 import com.qs.serve.modules.baz.entity.bo.BazCreateVisitInstanceBo;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/consts/BirActivityCenterGoodsUtil.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/consts/BirActivityCenterGoodsUtil.java
index b5e79de..d8c4bfd 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/consts/BirActivityCenterGoodsUtil.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/consts/BirActivityCenterGoodsUtil.java
@@ -1,8 +1,7 @@
 package com.qs.serve.modules.bir.consts;
 
 import cn.hutool.core.collection.CollUtil;
-import com.qs.serve.common.util.SpringUtils;
-import com.qs.serve.modules.bir.service.BirActivityCenterGoodsService;
+import com.qs.serve.framework.base.util.SpringUtils;
 import com.qs.serve.modules.tbs.entity.TbsCostBirLog;
 import com.qs.serve.modules.tbs.mapper.TbsCostBirLogMapper;
 import lombok.extern.slf4j.Slf4j;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/controller/BirActivityCenterGoodsController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/controller/BirActivityCenterGoodsController.java
index 5eefb11..a3bf680 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/controller/BirActivityCenterGoodsController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/controller/BirActivityCenterGoodsController.java
@@ -6,11 +6,12 @@ import com.alibaba.excel.write.metadata.WriteSheet;
 import com.aliyun.oss.OSS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.qs.serve.common.config.properties.AliYunOssProperties;
-import com.qs.serve.common.config.properties.ProjectProperties;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.*;
+import com.qs.serve.framework.base.config.properties.AliYunOssProperties;
+import com.qs.serve.framework.base.config.properties.ProjectProperties;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.bir.entity.BirActivityCenterGoods;
 import com.qs.serve.modules.bir.service.BirActivityCenterGoodsService;
 import com.qs.serve.modules.oss.service.OssService;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/controller/BirBudgetScheduleController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/controller/BirBudgetScheduleController.java
index 09c5fb4..904894c 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/controller/BirBudgetScheduleController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/controller/BirBudgetScheduleController.java
@@ -2,9 +2,9 @@ package com.qs.serve.modules.bir.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.CollectionUtil;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.util.CollectionUtil;
 import com.qs.serve.modules.tbs.entity.TbsSchedule;
 import com.qs.serve.modules.tbs.entity.TbsScheduleItem;
 import com.qs.serve.modules.tbs.entity.dto.TbsBudgetCheckingWithAmount;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java
index ca5f38c..239ce5b 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java
@@ -1,9 +1,10 @@
 package com.qs.serve.modules.bir.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.RepeatSubmit;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.annotation.RepeatSubmit;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bir.entity.so.BirBudgetTargetSo;
 import com.qs.serve.modules.bir.entity.so.BirCostRoiSo;
 import com.qs.serve.modules.bir.entity.vo.*;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/controller/BirTbsVtbPayJoinController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/controller/BirTbsVtbPayJoinController.java
index 50673cb..badbf1e 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/controller/BirTbsVtbPayJoinController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/controller/BirTbsVtbPayJoinController.java
@@ -1,27 +1,12 @@
 package com.qs.serve.modules.bir.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.RepeatSubmit;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.Assert;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.StringUtils;
-import com.qs.serve.common.util.bus.QueryFilterUtil;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.util.bus.QueryFilterUtil;
 import com.qs.serve.modules.bir.entity.dto.BirTbsVtbPayJoinDTO;
-import com.qs.serve.modules.bir.entity.so.BirCostRoiSo;
 import com.qs.serve.modules.bir.entity.so.BirTbsVtbPayJoinSo;
-import com.qs.serve.modules.bir.entity.vo.BirAccountReportVo;
-import com.qs.serve.modules.bir.entity.vo.BirRoiCostItemVo;
-import com.qs.serve.modules.bir.entity.vo.BirRoiVo;
 import com.qs.serve.modules.bir.service.*;
-import com.qs.serve.modules.sys.entity.SysDictData;
-import com.qs.serve.modules.sys.service.SysDictDataService;
-import com.qs.serve.modules.tbs.common.TbsCenterType;
-import com.qs.serve.modules.tbs.entity.dto.TbsCostSubItem;
-import com.qs.serve.modules.tbs.service.TbsBudgetService;
-import com.qs.serve.modules.vtb.entity.VtbVerification;
-import com.qs.serve.modules.vtb.entity.dto.VtbActivityCheckDTO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -29,9 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/entity/vo/BirAccountReportVo.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/entity/vo/BirAccountReportVo.java
index 47a0998..b410dc2 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/entity/vo/BirAccountReportVo.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/entity/vo/BirAccountReportVo.java
@@ -1,10 +1,9 @@
 package com.qs.serve.modules.bir.entity.vo;
 
-import com.qs.serve.common.model.dto.HeaderOption;
+import com.qs.serve.framework.base.model.dto.HeaderOption;
 import lombok.Data;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author YenHex
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/entity/vo/BirReportVo.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/entity/vo/BirReportVo.java
index fb9c1a4..69f02a7 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/entity/vo/BirReportVo.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/entity/vo/BirReportVo.java
@@ -1,6 +1,6 @@
 package com.qs.serve.modules.bir.entity.vo;
 
-import com.qs.serve.common.model.dto.HeaderOption;
+import com.qs.serve.framework.base.model.dto.HeaderOption;
 import lombok.Data;
 
 import java.util.List;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/mapper/BirActivityCenterGoodsMapper.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/mapper/BirActivityCenterGoodsMapper.java
index ad997ee..9591926 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/mapper/BirActivityCenterGoodsMapper.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/mapper/BirActivityCenterGoodsMapper.java
@@ -3,18 +3,15 @@ package com.qs.serve.modules.bir.mapper;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qs.serve.common.model.consts.DSName;
+import com.qs.serve.framework.base.model.consts.DSName;
 import com.qs.serve.modules.bir.entity.BirActivityCenterGoods;
 import com.qs.serve.modules.bir.entity.so.BirBudgetTargetSo;
 import com.qs.serve.modules.bir.entity.so.BirMonthCusCenterSo;
 import com.qs.serve.modules.bir.entity.vo.BirActivityCenterGoodsMonthVo;
 import com.qs.serve.modules.bir.entity.vo.BirBaseDispatchVo;
-import com.qs.serve.modules.tbs.entity.TbsActivityCenterGoods;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 
 import java.math.BigDecimal;
-import java.time.LocalDate;
 import java.util.List;
 
 /**
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/mapper/BirBaseActivityMapper.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/mapper/BirBaseActivityMapper.java
index d107cce..623eced 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/mapper/BirBaseActivityMapper.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/mapper/BirBaseActivityMapper.java
@@ -3,14 +3,11 @@ package com.qs.serve.modules.bir.mapper;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qs.serve.common.model.consts.DSName;
+import com.qs.serve.framework.base.model.consts.DSName;
 import com.qs.serve.modules.bir.entity.BirBaseActivity;
 import com.qs.serve.modules.bir.entity.dto.UnMatchBirRecord;
-import com.qs.serve.modules.tbs.entity.TbsActivity;
-import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
-import java.time.LocalDate;
 import java.util.List;
 
 /**
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/mapper/BirBudgetTargetMapper.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/mapper/BirBudgetTargetMapper.java
index fa11b81..2259aa5 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/mapper/BirBudgetTargetMapper.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/mapper/BirBudgetTargetMapper.java
@@ -3,7 +3,7 @@ package com.qs.serve.modules.bir.mapper;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qs.serve.common.model.consts.DSName;
+import com.qs.serve.framework.base.model.consts.DSName;
 import com.qs.serve.modules.bir.entity.BirBudgetTarget;
 import com.qs.serve.modules.bir.entity.so.BirBudgetTargetSo;
 import org.apache.ibatis.annotations.Param;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/mapper/BirRoiRateMapper.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/mapper/BirRoiRateMapper.java
index b7e10c1..24f7bf1 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/mapper/BirRoiRateMapper.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/mapper/BirRoiRateMapper.java
@@ -3,7 +3,7 @@ package com.qs.serve.modules.bir.mapper;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qs.serve.common.model.consts.DSName;
+import com.qs.serve.framework.base.model.consts.DSName;
 import com.qs.serve.modules.bir.entity.BirRoiRate;
 import com.qs.serve.modules.bir.entity.dto.BirRoiCostDTO;
 import com.qs.serve.modules.bir.entity.vo.BirRoiCostItemVo;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/BirRoiRateService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/BirRoiRateService.java
index 29a424f..f0b2086 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/BirRoiRateService.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/BirRoiRateService.java
@@ -1,7 +1,6 @@
 package com.qs.serve.modules.bir.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qs.serve.common.model.dto.R;
 import com.qs.serve.modules.bir.entity.BirRoiRate;
 import com.qs.serve.modules.bir.entity.dto.BirRoiCostDTO;
 import com.qs.serve.modules.bir.entity.so.BirCostRoiSo;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/BirTbsVtbPayJoinService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/BirTbsVtbPayJoinService.java
index 3d0012a..cd80334 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/BirTbsVtbPayJoinService.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/BirTbsVtbPayJoinService.java
@@ -1,13 +1,10 @@
 package com.qs.serve.modules.bir.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.modules.bir.entity.BirBaseActivity;
+import com.qs.serve.framework.base.model.PageVo;
 import com.qs.serve.modules.bir.entity.dto.BirTbsVtbPayJoinDTO;
 import com.qs.serve.modules.bir.entity.so.BirTbsVtbPayJoinSo;
 
-import java.util.List;
-
 /**
  * ROI费率(活动档案) 服务接口
  * @author YenHex
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java
index 82dad4d..74f6088 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java
@@ -5,13 +5,9 @@ import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.model.dto.DateSplitDTO;
-import com.qs.serve.common.util.Assert;
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.common.util.DateSplitUtil;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.modules.bir.entity.BirBaseActivity;
-import com.qs.serve.modules.bir.entity.BirRemoveId;
+import com.qs.serve.framework.base.model.dto.DateSplitDTO;
+import com.qs.serve.framework.base.util.CollectionUtil;
+import com.qs.serve.framework.base.util.DateSplitUtil;
 import com.qs.serve.modules.bir.entity.dto.BirCenterGoodSplitDTO;
 import com.qs.serve.modules.bir.service.BirBaseActivityService;
 import com.qs.serve.modules.bms.entity.BmsCostCenter;
@@ -28,13 +24,7 @@ import com.qs.serve.modules.tbs.entity.*;
 import com.qs.serve.modules.tbs.mapper.TbsActivityCenterGoodsMapper;
 import com.qs.serve.modules.tbs.mapper.TbsActivityMapper;
 import com.qs.serve.modules.tbs.mapper.TbsCostApplyMapper;
-import com.qs.serve.modules.tbs.service.TbsActivityCenterGoodsService;
 import com.qs.serve.modules.tbs.service.TbsBudgetCostItemService;
-import com.qs.serve.modules.vtb.common.VtbFundFlowType;
-import com.qs.serve.modules.vtb.entity.VtbFundFlow;
-import com.qs.serve.modules.vtb.entity.dto.VtbFundFlowSumAmtDTO;
-import com.qs.serve.modules.vtb.mapper.VtbFundFlowMapper;
-import com.tencentcloudapi.cii.v20201210.models.ResultObject;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
@@ -48,7 +38,6 @@ import java.math.RoundingMode;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java
index ca94df1..b4bf471 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java
@@ -3,12 +3,10 @@ package com.qs.serve.modules.bir.service.impl;
 import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.model.dto.DateSplitDTO;
-import com.qs.serve.common.util.Assert;
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.common.util.DateSplitUtil;
+import com.qs.serve.framework.base.model.dto.DateSplitDTO;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.util.DateSplitUtil;
 import com.qs.serve.modules.bir.entity.dto.UnMatchBirRecord;
-import com.qs.serve.modules.sys.mapper.SysUserMapper;
 import com.qs.serve.modules.tbs.entity.TbsActivity;
 import com.qs.serve.modules.tbs.entity.TbsCostApply;
 import com.qs.serve.modules.tbs.mapper.TbsActivityMapper;
@@ -25,7 +23,6 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.time.Period;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/impl/BirBudgetTargetImportServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/impl/BirBudgetTargetImportServiceImpl.java
index e0541e6..d25a396 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/impl/BirBudgetTargetImportServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/impl/BirBudgetTargetImportServiceImpl.java
@@ -1,28 +1,24 @@
 package com.qs.serve.modules.bir.service.impl;
 
-import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.util.*;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.base.ErpDataBaseService;
 import com.qs.serve.modules.bir.entity.BirActivityCenterGoods;
 import com.qs.serve.modules.bir.entity.BirBudgetTarget;
 import com.qs.serve.modules.bir.entity.BirCityTargetView;
 import com.qs.serve.modules.bir.entity.so.BirBudgetTargetSo;
-import com.qs.serve.modules.bir.entity.vo.BirBudgetTargetVo;
 import com.qs.serve.modules.bir.mapper.BirActivityCenterGoodsMapper;
 import com.qs.serve.modules.bir.mapper.BirBudgetTargetMapper;
 import com.qs.serve.modules.bir.service.BirBudgetTargetImportService;
-import com.qs.serve.modules.bir.service.BirBudgetTargetService;
 import com.qs.serve.modules.bir.service.BirCityTargetViewService;
-import com.qs.serve.modules.bms.entity.BmsRegion2;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.service.BmsRegion2Service;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
 import com.qs.serve.modules.erp.entity.dto.ErpDispatchSumVo;
 import com.qs.serve.modules.erp.mapper.ErpDispatchDataMapper;
-import com.qs.serve.modules.goods.entity.GoodsCategory;
 import com.qs.serve.modules.goods.entity.GoodsSku;
 import com.qs.serve.modules.goods.entity.GoodsSpu;
 import com.qs.serve.modules.goods.service.GoodsCategoryService;
@@ -30,17 +26,13 @@ import com.qs.serve.modules.goods.service.GoodsSkuService;
 import com.qs.serve.modules.goods.service.GoodsSpuService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.sql.SQLException;
-import java.time.LocalDateTime;
-import java.time.temporal.TemporalAdjusters;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -583,4 +575,4 @@ public class BirBudgetTargetImportServiceImpl extends ServiceImpl<BirBudgetTarge
             List<BirBudgetTarget> cityList = this.list(birCityLambdaQueryWrapper);
         });
     }
-}
\ No newline at end of file
+}
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/impl/BirBudgetTargetServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/impl/BirBudgetTargetServiceImpl.java
index 50b9de5..c7e2dfc 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/impl/BirBudgetTargetServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/impl/BirBudgetTargetServiceImpl.java
@@ -3,10 +3,10 @@ package com.qs.serve.modules.bir.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.Assert;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.exception.Assert;
 import com.qs.serve.modules.tbs.common.util.BirHttpUtil;
-import com.qs.serve.common.util.CollectionUtil;
+import com.qs.serve.framework.base.util.CollectionUtil;
 import com.qs.serve.modules.bir.entity.BirActivityCenterGoods;
 import com.qs.serve.modules.bir.entity.so.BirBudgetTargetSo;
 import com.qs.serve.modules.bir.entity.vo.BirBaseDispatchVo;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/impl/BirCenterRateServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/impl/BirCenterRateServiceImpl.java
index 9473cc0..a9d32ba 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/impl/BirCenterRateServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/impl/BirCenterRateServiceImpl.java
@@ -1,31 +1,19 @@
 package com.qs.serve.modules.bir.service.impl;
 
-import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.model.enums.BudgetLogOptFlag;
-import com.qs.serve.common.model.enums.MonthValues;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.SpringUtils;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.enums.BudgetLogOptFlag;
+import com.qs.serve.common.enums.MonthValues;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bir.entity.BirActivityCenterGoods;
-import com.qs.serve.modules.bir.entity.BirRoiRate;
 import com.qs.serve.modules.bir.entity.dto.BirRoiCostDTO;
-import com.qs.serve.modules.bir.entity.so.BirCostRoiSo;
 import com.qs.serve.modules.bir.entity.so.BirMonthCusCenterSo;
 import com.qs.serve.modules.bir.entity.vo.BirActivityCenterGoodsMonthVo;
 import com.qs.serve.modules.bir.entity.vo.BirCostApplyRateVo;
-import com.qs.serve.modules.bir.entity.vo.BirRoiCostItemVo;
-import com.qs.serve.modules.bir.entity.vo.YtdQtdToOAVo;
 import com.qs.serve.modules.bir.mapper.BirActivityCenterGoodsMapper;
-import com.qs.serve.modules.bir.mapper.BirRoiRateMapper;
-import com.qs.serve.modules.bir.service.BirActivityCenterGoodsService;
 import com.qs.serve.modules.bir.service.BirCenterRateService;
 import com.qs.serve.modules.bir.service.BirRoiRateService;
-import com.qs.serve.modules.bms.entity.BmsCenterRegion;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.entity.BmsSupplierTarget;
-import com.qs.serve.modules.bms.mapper.BmsCenterRegionMapper;
 import com.qs.serve.modules.bms.mapper.BmsSupplierMapper;
 import com.qs.serve.modules.bms.mapper.BmsSupplierTargetMapper;
 import com.qs.serve.modules.erp.entity.dto.ErpDispatchSumVo;
@@ -40,7 +28,6 @@ import com.qs.serve.modules.tzc.entity.TzcPolicy;
 import com.qs.serve.modules.tzc.entity.TzcPolicyItem;
 import com.qs.serve.modules.tzc.mapper.TzcPolicyItemMapper;
 import com.qs.serve.modules.tzc.mapper.TzcPolicyMapper;
-import com.qs.serve.modules.tzc.service.TzcPolicyService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -48,7 +35,6 @@ import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDate;
-import java.time.Month;
 import java.util.*;
 import java.util.stream.Collectors;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/impl/BirReportAccountBookServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/impl/BirReportAccountBookServiceImpl.java
index 141cdf5..d3cace7 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/impl/BirReportAccountBookServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/impl/BirReportAccountBookServiceImpl.java
@@ -1,47 +1,30 @@
 package com.qs.serve.modules.bir.service.impl;
 
-import cn.hutool.core.util.ArrayUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.model.dto.HeaderOption;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.modules.bir.entity.BirRoiRate;
-import com.qs.serve.modules.bir.entity.dto.BirRoiCostDTO;
-import com.qs.serve.modules.bir.entity.so.BirCostRoiSo;
+import com.qs.serve.common.utils.CopierUtil;
 import com.qs.serve.modules.bir.entity.vo.*;
 import com.qs.serve.modules.bir.mapper.BirReportAccountBookMapper;
-import com.qs.serve.modules.bir.mapper.BirRoiRateMapper;
 import com.qs.serve.modules.bir.service.BirReportAccountBookService;
-import com.qs.serve.modules.bir.service.BirRoiRateService;
 import com.qs.serve.modules.bms.entity.BmsCostCenter;
 import com.qs.serve.modules.bms.entity.BmsRegion;
 import com.qs.serve.modules.bms.entity.BmsRegion2;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
-import com.qs.serve.modules.bms.entity.vo.BmsRegionTreeVo;
-import com.qs.serve.modules.bms.mapper.BmsSupplierMapper;
 import com.qs.serve.modules.bms.service.BmsCostCenterService;
 import com.qs.serve.modules.bms.service.BmsRegion2Service;
 import com.qs.serve.modules.bms.service.BmsRegionService;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
-import com.qs.serve.modules.erp.entity.dto.ErpDispatchSumVo;
 import com.qs.serve.modules.erp.mapper.ErpDispatchDataMapper;
 import com.qs.serve.modules.goods.entity.dto.TbsCenterDto;
 import com.qs.serve.modules.tbs.common.TbsCenterType;
 import com.qs.serve.modules.tbs.entity.TbsBudgetPlan;
-import com.qs.serve.modules.tbs.entity.TbsCostApply;
-import com.qs.serve.modules.tbs.entity.TbsScheduleItem;
 import com.qs.serve.modules.tbs.mapper.TbsBudgetLogMapper;
 import com.qs.serve.modules.tbs.mapper.TbsScheduleItemMapper;
-import com.qs.serve.modules.tbs.service.TbsBudgetLogService;
 import com.qs.serve.modules.tbs.service.TbsBudgetPlanService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.time.LocalDate;
-import java.time.Month;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java
index 34f7b8d..57e80b0 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java
@@ -3,7 +3,7 @@ package com.qs.serve.modules.bir.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.util.CopierUtil;
+import com.qs.serve.common.utils.CopierUtil;
 import com.qs.serve.modules.bir.entity.dto.BirRoiCostDTO;
 import com.qs.serve.modules.bir.entity.so.BirCostRoiSo;
 import com.qs.serve.modules.bir.entity.vo.BirRoiCostItemVo;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/impl/BirScheduleItemBudgetServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/impl/BirScheduleItemBudgetServiceImpl.java
index 94c7201..87242a2 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/impl/BirScheduleItemBudgetServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/impl/BirScheduleItemBudgetServiceImpl.java
@@ -1,12 +1,11 @@
 package com.qs.serve.modules.bir.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.model.dto.DateSplitDTO;
-import com.qs.serve.common.model.enums.BudgetLogOptFlag;
-import com.qs.serve.common.util.Assert;
-import com.qs.serve.common.util.DateSplitUtil;
+import com.qs.serve.framework.base.model.dto.DateSplitDTO;
+import com.qs.serve.common.enums.BudgetLogOptFlag;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.util.DateSplitUtil;
 import com.qs.serve.modules.tbs.entity.TbsBudget;
 import com.qs.serve.modules.tbs.entity.TbsBudgetLog;
 import com.qs.serve.modules.tbs.entity.TbsScheduleItemBudget;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/impl/BirTbsVtbPayJoinServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/impl/BirTbsVtbPayJoinServiceImpl.java
index c5388a4..727a4d5 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/impl/BirTbsVtbPayJoinServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bir/service/impl/BirTbsVtbPayJoinServiceImpl.java
@@ -1,31 +1,17 @@
 package com.qs.serve.modules.bir.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.model.dto.DateSplitDTO;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.*;
-import com.qs.serve.modules.bir.consts.TbsVtbPayShowType;
-import com.qs.serve.modules.bir.entity.BirBaseActivity;
-import com.qs.serve.modules.bir.entity.dto.BirPayJoinDTO;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.bir.entity.dto.BirTbsVtbPayJoinDTO;
-import com.qs.serve.modules.bir.entity.dto.BirVtbPayJoinDTO;
 import com.qs.serve.modules.bir.entity.so.BirTbsVtbPayJoinSo;
 import com.qs.serve.modules.bir.mapper.BirTbsVtbPayJoinMapper;
-import com.qs.serve.modules.bir.service.BirBaseActivityService;
 import com.qs.serve.modules.bir.service.BirTbsVtbPayJoinService;
-import com.qs.serve.modules.pay.entity.PayPayment;
-import com.qs.serve.modules.pay.entity.PayPaymentItem;
 import com.qs.serve.modules.pay.service.PayPaymentItemService;
 import com.qs.serve.modules.pay.service.PayPaymentService;
-import com.qs.serve.modules.tbs.entity.TbsActivity;
-import com.qs.serve.modules.tbs.entity.TbsCostApply;
-import com.qs.serve.modules.tbs.mapper.TbsActivityMapper;
-import com.qs.serve.modules.tbs.mapper.TbsCostApplyMapper;
 import com.qs.serve.modules.tbs.service.TbsActivityService;
 import com.qs.serve.modules.tbs.service.TbsCostApplyService;
-import com.qs.serve.modules.vtb.entity.VtbVerification;
 import com.qs.serve.modules.vtb.service.VtbVerificationService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -33,15 +19,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Optional;
-import java.util.function.Function;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * ROI费率(活动档案) 服务实现类
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/BizAppLogController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/BizAppLogController.java
index 5b7c94f..e30471d 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/BizAppLogController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/BizAppLogController.java
@@ -1,10 +1,8 @@
 package com.qs.serve.modules.biz.controller;
 
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.biz.entity.BizAppLog;
 import com.qs.serve.modules.biz.service.BizAppLogService;
 import lombok.RequiredArgsConstructor;
@@ -12,7 +10,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import java.util.*;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/BizCommentController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/BizCommentController.java
index 3139ec8..53742b5 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/BizCommentController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/BizCommentController.java
@@ -1,12 +1,15 @@
 package com.qs.serve.modules.biz.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
 import com.qs.serve.modules.sys.entity.SysAttach;
 import com.qs.serve.modules.sys.entity.SysUser;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/BizCusVisitController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/BizCusVisitController.java
index fb40fdd..9fe654e 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/BizCusVisitController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/BizCusVisitController.java
@@ -1,17 +1,15 @@
 package com.qs.serve.modules.biz.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import com.qs.serve.modules.biz.entity.BizCusVisit;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/BizSignTypeController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/BizSignTypeController.java
index 9984fdb..506c459 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/BizSignTypeController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/BizSignTypeController.java
@@ -1,21 +1,20 @@
 package com.qs.serve.modules.biz.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.biz.entity.BizVisitForm;
 import com.qs.serve.modules.biz.entity.so.BizSignTypeQuery;
 import com.qs.serve.modules.biz.entity.vo.BizSignTypeVo;
 import com.qs.serve.modules.biz.service.BizVisitFormService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import com.qs.serve.modules.biz.entity.BizSignType;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/BizUserGroupController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/BizUserGroupController.java
index eff5e45..0ee70ee 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/BizUserGroupController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/BizUserGroupController.java
@@ -1,11 +1,11 @@
 package com.qs.serve.modules.biz.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.biz.entity.BizUserGroupItem;
 import com.qs.serve.modules.biz.entity.bo.BizUserGroupBatchBo;
 import com.qs.serve.modules.biz.service.BizUserGroupItemService;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/BizUserGroupItemController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/BizUserGroupItemController.java
index 6435c9c..da704b6 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/BizUserGroupItemController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/BizUserGroupItemController.java
@@ -1,20 +1,15 @@
 package com.qs.serve.modules.biz.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.biz.entity.bo.BizUserGroupBatchBo;
 import com.qs.serve.modules.biz.entity.bo.BizUserGroupItemBatchBo;
 import com.qs.serve.modules.biz.service.impl.BizUserGroupApplicationService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import com.qs.serve.modules.biz.entity.BizUserGroupItem;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/BizVisitController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/BizVisitController.java
index 46bf656..17c3d96 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/BizVisitController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/BizVisitController.java
@@ -1,13 +1,13 @@
 package com.qs.serve.modules.biz.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.biz.mapper.BizVisitMapper;
 import com.qs.serve.modules.sys.service.SysPostUserService;
 import lombok.AllArgsConstructor;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/BizVisitFormController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/BizVisitFormController.java
index b8c565c..ebb9f6c 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/BizVisitFormController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/BizVisitFormController.java
@@ -1,17 +1,16 @@
 package com.qs.serve.modules.biz.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.StringUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import com.qs.serve.modules.biz.entity.BizVisitForm;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/api/BizCusVisitApi.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/api/BizCusVisitApi.java
index c9d0de7..60dcb09 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/api/BizCusVisitApi.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/api/BizCusVisitApi.java
@@ -1,9 +1,9 @@
 package com.qs.serve.modules.biz.controller.api;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.biz.entity.BizCusVisit;
 import com.qs.serve.modules.biz.entity.bo.BizCusVisitBo;
 import com.qs.serve.modules.biz.service.BizCusVisitService;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/api/BizVisitApi.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/api/BizVisitApi.java
index 93a241a..bac7b49 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/api/BizVisitApi.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/api/BizVisitApi.java
@@ -1,9 +1,9 @@
 package com.qs.serve.modules.biz.controller.api;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.biz.entity.BizVisit;
 import com.qs.serve.modules.biz.service.BizSignTypeService;
 import com.qs.serve.modules.biz.service.BizVisitService;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/my/BizVisitMyController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/my/BizVisitMyController.java
index 19dd119..3767b20 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/my/BizVisitMyController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/controller/my/BizVisitMyController.java
@@ -1,10 +1,10 @@
 package com.qs.serve.modules.biz.controller.my;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.biz.entity.BizVisit;
 import com.qs.serve.modules.biz.service.BizVisitService;
 import com.qs.serve.modules.sys.entity.SysUser;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/entity/BizComment.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/entity/BizComment.java
index b047988..ec3b1ca 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/entity/BizComment.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/entity/BizComment.java
@@ -1,8 +1,6 @@
 package com.qs.serve.modules.biz.entity;
 
-import java.time.LocalDate;
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -10,13 +8,12 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
+import com.qs.serve.mbp.handler.SplitStringTypeHandler;
 import lombok.Data;
 import org.apache.ibatis.type.JdbcType;
 import org.hibernate.validator.constraints.Length;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotBlank;
 
 /**
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/entity/BizCusVisit.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/entity/BizCusVisit.java
index fb834a6..ff3d35e 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/entity/BizCusVisit.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/entity/BizCusVisit.java
@@ -1,15 +1,13 @@
 package com.qs.serve.modules.biz.entity;
 
-import java.time.LocalDate;
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
+import com.qs.serve.mbp.handler.SplitStringTypeHandler;
 import com.qs.serve.modules.biz.entity.bo.BizCusVisitBo;
 import lombok.Data;
 import org.apache.ibatis.type.JdbcType;
@@ -17,7 +15,6 @@ import org.hibernate.validator.constraints.Length;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
 
 /**
  * 拜访日志 实体类
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/entity/BizVisit.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/entity/BizVisit.java
index f9a30e3..32469c7 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/entity/BizVisit.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/entity/BizVisit.java
@@ -8,15 +8,12 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
+import com.qs.serve.mbp.handler.SplitStringTypeHandler;
 import lombok.Data;
 import org.apache.ibatis.type.JdbcType;
 import org.hibernate.validator.constraints.Length;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
-
 /**
  * 拜访日志 实体类
  * @author YenHex
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/entity/bo/BizCusVisitBo.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/entity/bo/BizCusVisitBo.java
index 12c0c34..9f824b6 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/entity/bo/BizCusVisitBo.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/entity/bo/BizCusVisitBo.java
@@ -1,19 +1,10 @@
 package com.qs.serve.modules.biz.entity.bo;
 
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
 import lombok.Data;
-import org.apache.ibatis.type.JdbcType;
 import org.hibernate.validator.constraints.Length;
-import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 
 /**
  * 拜访日志 实体类
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/service/BizAppLogService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/service/BizAppLogService.java
index cc41954..aa91004 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/service/BizAppLogService.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/service/BizAppLogService.java
@@ -1,7 +1,6 @@
 package com.qs.serve.modules.biz.service;
 
 
-import com.qs.serve.common.model.dto.PageVo;
 import com.qs.serve.modules.biz.entity.BizAppLog;
 
 import java.util.Collection;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/service/impl/BizAppLogServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/service/impl/BizAppLogServiceImpl.java
index 513c70c..769860a 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/service/impl/BizAppLogServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/service/impl/BizAppLogServiceImpl.java
@@ -2,7 +2,7 @@ package com.qs.serve.modules.biz.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.ServletUtils;
+import com.qs.serve.common.utils.ServletUtils;
 import com.qs.serve.modules.biz.entity.BizAppLog;
 import com.qs.serve.modules.biz.mapper.BizAppLogMapper;
 import com.qs.serve.modules.biz.service.BizAppLogService;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/service/impl/BizUserGroupApplicationService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/service/impl/BizUserGroupApplicationService.java
index 4eeb2f4..c15548b 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/service/impl/BizUserGroupApplicationService.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/biz/service/impl/BizUserGroupApplicationService.java
@@ -1,7 +1,7 @@
 package com.qs.serve.modules.biz.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.util.Assert;
+import com.qs.serve.common.exception.Assert;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
 import com.qs.serve.modules.biz.consts.GroupDataType;
 import com.qs.serve.modules.biz.entity.BizUserGroup;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/common/BookAccountUtil.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/common/BookAccountUtil.java
index e322e1e..390fd19 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/common/BookAccountUtil.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/common/BookAccountUtil.java
@@ -3,7 +3,7 @@ package com.qs.serve.modules.bms.common;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.SpringUtils;
+import com.qs.serve.framework.base.util.SpringUtils;
 import com.qs.serve.modules.bms.entity.BmsAccountUser;
 import com.qs.serve.modules.bms.mapper.BmsAccountUserMapper;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsAccountController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsAccountController.java
index 3624a7f..e343d49 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsAccountController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsAccountController.java
@@ -1,17 +1,13 @@
 package com.qs.serve.modules.bms.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.StringUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import com.qs.serve.modules.bms.entity.BmsAccount;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsAccountUserController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsAccountUserController.java
index 966519e..b968aa8 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsAccountUserController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsAccountUserController.java
@@ -1,18 +1,16 @@
 package com.qs.serve.modules.bms.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bms.entity.bo.BmsAccountUserBo;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import com.qs.serve.modules.bms.entity.BmsAccountUser;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsApplyMessageController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsApplyMessageController.java
index 8f48189..c344d07 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsApplyMessageController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsApplyMessageController.java
@@ -1,20 +1,18 @@
 package com.qs.serve.modules.bms.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.consts.ApplyTypeConst;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.dto.SimpleKeyValue;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.consts.ApplyTypeConst;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.model.dto.SimpleKeyValue;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bms.entity.bo.BmsApplyMessageTestBo;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import com.qs.serve.modules.bms.entity.BmsApplyMessage;
@@ -22,9 +20,7 @@ import com.qs.serve.modules.bms.service.BmsApplyMessageService;
 
 import javax.validation.Valid;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 基础档案 申请信息
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsCenterExtendController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsCenterExtendController.java
index fc437c9..6ac28f8 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsCenterExtendController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsCenterExtendController.java
@@ -1,21 +1,19 @@
 package com.qs.serve.modules.bms.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.CopierUtil;
 import com.qs.serve.modules.bms.entity.BmsCenterExtendUser;
 import com.qs.serve.modules.bms.entity.bo.BmsCenterExtendBo;
 import com.qs.serve.modules.bms.service.BmsCenterExtendBuildService;
 import com.qs.serve.modules.bms.service.BmsCenterExtendUserService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.omg.CORBA.DynAnyPackage.Invalid;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
@@ -23,7 +21,6 @@ import com.qs.serve.modules.bms.entity.so.BmsCenterExtendSo;
 import com.qs.serve.modules.bms.entity.BmsCenterExtend;
 import com.qs.serve.modules.bms.service.BmsCenterExtendService;
 
-import javax.validation.Valid;
 import java.util.List;
 
 /**
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java
index bb643a1..f42261b 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java
@@ -1,13 +1,15 @@
 package com.qs.serve.modules.bms.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bms.common.MasterUserType;
 import com.qs.serve.modules.bms.controller.my.BmsChannelMyController;
 import com.qs.serve.modules.bms.entity.*;
@@ -17,7 +19,6 @@ import com.qs.serve.modules.bms.mapper.BmsMasterUserMapper;
 import com.qs.serve.modules.bms.service.BmsChannelPointService;
 import com.qs.serve.modules.bms.service.BmsSupplierChannelService;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
-import com.qs.serve.modules.his.entity.HisUserChannelPoint;
 import com.qs.serve.modules.his.service.HisUserChannelPointService;
 import com.qs.serve.modules.tbs.entity.TbsActivityChannel;
 import com.qs.serve.modules.tbs.service.TbsActivityChannelService;
@@ -30,7 +31,6 @@ import com.qs.serve.modules.bms.service.BmsChannelService;
 
 import javax.validation.Valid;
 import java.util.*;
-import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 /**
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java
index c5ce307..108aae1 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java
@@ -1,13 +1,16 @@
 package com.qs.serve.modules.bms.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.dto.RowParam;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.model.dto.RowParam;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.baz.common.BazTargetTypeConsts;
 import com.qs.serve.modules.baz.entity.BazVisitInfo;
 import com.qs.serve.modules.baz.service.BazVisitInfoService;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsCostCenterController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsCostCenterController.java
index 809557a..b66fb8e 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsCostCenterController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsCostCenterController.java
@@ -1,11 +1,14 @@
 package com.qs.serve.modules.bms.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.TreeUtil;
 import com.qs.serve.modules.bir.entity.so.BirBudgetTargetSo;
 import com.qs.serve.modules.bir.service.BirBudgetTargetService;
 import com.qs.serve.modules.bms.common.MasterUserType;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsDutyInfoController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsDutyInfoController.java
index cee9107..932210d 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsDutyInfoController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsDutyInfoController.java
@@ -1,7 +1,7 @@
 package com.qs.serve.modules.bms.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.dto.R;
+import com.qs.serve.framework.base.model.R;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsFactoryController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsFactoryController.java
index a413601..d69c990 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsFactoryController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsFactoryController.java
@@ -1,14 +1,12 @@
 package com.qs.serve.modules.bms.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.bms.common.FactoryIdOperation;
 import com.qs.serve.modules.bms.service.BmsRegionService;
 import com.qs.serve.modules.goods.service.GoodsSpecValueService;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsMasterUserController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsMasterUserController.java
index 0791310..a74279e 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsMasterUserController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsMasterUserController.java
@@ -1,15 +1,17 @@
 package com.qs.serve.modules.bms.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bms.common.MasterUserType;
 import com.qs.serve.modules.bms.entity.*;
-import com.qs.serve.modules.bms.entity.vo.BmsMasterUserCenterVo;
 import com.qs.serve.modules.bms.entity.vo.BmsMasterUserChannelVo;
 import com.qs.serve.modules.bms.mapper.BmsMasterUserMapper;
 import com.qs.serve.modules.bms.service.BmsChannelPointService;
@@ -24,14 +26,12 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import com.qs.serve.modules.bms.entity.vo.BmsMasterUserVo;
 import com.qs.serve.modules.bms.entity.bo.BmsMasterUserBo;
 import com.qs.serve.modules.bms.service.BmsMasterUserService;
 
 import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 基础档案 负责人
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsRegion2Controller.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsRegion2Controller.java
index b959873..0268b7e 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsRegion2Controller.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsRegion2Controller.java
@@ -1,13 +1,17 @@
 package com.qs.serve.modules.bms.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.LimitSubmit;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.annotation.LimitSubmit;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
+import com.qs.serve.common.utils.TreeUtil;
 import com.qs.serve.modules.bir.entity.so.BirBudgetTargetSo;
 import com.qs.serve.modules.bir.service.BirBudgetTargetService;
 import com.qs.serve.modules.bms.entity.BmsRegion2;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java
index b7271a4..c7ca8a7 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionController.java
@@ -1,13 +1,17 @@
 package com.qs.serve.modules.bms.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.LimitSubmit;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.annotation.LimitSubmit;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
+import com.qs.serve.common.utils.TreeUtil;
 import com.qs.serve.modules.bir.entity.so.BirBudgetTargetSo;
 import com.qs.serve.modules.bir.service.BirBudgetTargetService;
 import com.qs.serve.modules.bms.entity.*;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionUserController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionUserController.java
index 5540a26..41ac9c3 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionUserController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsRegionUserController.java
@@ -1,15 +1,13 @@
 package com.qs.serve.modules.bms.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.framework.base.util.CollectionUtil;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bms.entity.BmsChannelPoint;
 import com.qs.serve.modules.bms.entity.BmsRegion;
 import com.qs.serve.modules.bms.entity.BmsRegion2;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsRuleController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsRuleController.java
index e32060f..6e3dbdc 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsRuleController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsRuleController.java
@@ -1,13 +1,13 @@
 package com.qs.serve.modules.bms.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.framework.base.util.CollectionUtil;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.bms.entity.BmsRegion;
 import com.qs.serve.modules.bms.entity.BmsRuleRegion;
 import com.qs.serve.modules.bms.entity.BmsRuleSku;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSkuSupplierController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSkuSupplierController.java
index 97fd3ab..2268acd 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSkuSupplierController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSkuSupplierController.java
@@ -1,17 +1,16 @@
 package com.qs.serve.modules.bms.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.bms.entity.bo.BmsSkuSupplierBo;
 import com.qs.serve.modules.bms.entity.bo.BmsSkuSupplierBo2;
 import com.qs.serve.modules.bms.entity.vo.BmsSkuSupplierVo;
-import com.qs.serve.modules.bms.service.BmsSupplierService;
 import com.qs.serve.modules.goods.entity.GoodsSku;
 import com.qs.serve.modules.goods.service.GoodsSkuService;
 import lombok.AllArgsConstructor;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectController.java
index f1282f8..2ed418b 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectController.java
@@ -1,20 +1,19 @@
 package com.qs.serve.modules.bms.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.StringUtils;
+import com.qs.serve.common.utils.TreeUtil;
 import com.qs.serve.modules.bms.entity.*;
-import com.qs.serve.modules.bms.entity.bo.BmsCostCenterBo;
-import com.qs.serve.modules.bms.entity.vo.BmsRegionTreeVo;
 import com.qs.serve.modules.bms.entity.vo.BmsSubjectTreeVo;
 import com.qs.serve.modules.bms.mapper.BmsSubjectMapper;
-import com.qs.serve.modules.bms.mapper.BmsSupplierMapper;
 import com.qs.serve.modules.bms.service.*;
-import com.qs.serve.modules.goods.entity.GoodsCategory;
 import com.qs.serve.modules.tbs.entity.TbsActivitySubject;
 import com.qs.serve.modules.tbs.service.TbsActivitySubjectService;
 import lombok.AllArgsConstructor;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectFormController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectFormController.java
index e755ac2..07f360e 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectFormController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectFormController.java
@@ -1,17 +1,16 @@
 package com.qs.serve.modules.bms.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bms.entity.BmsSubject;
 import com.qs.serve.modules.bms.service.BmsSubjectService;
-import com.qs.serve.modules.bms.service.BmsSupplierService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierAddressController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierAddressController.java
index 2a6dec0..f330c3a 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierAddressController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierAddressController.java
@@ -1,13 +1,12 @@
 package com.qs.serve.modules.bms.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.JsonUtil;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
 import lombok.AllArgsConstructor;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierBandController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierBandController.java
index d8a6e9a..b26338a 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierBandController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierBandController.java
@@ -1,14 +1,13 @@
 package com.qs.serve.modules.bms.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
-import com.qs.serve.modules.bms.entity.BmsSupplierAddress;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierChannelController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierChannelController.java
index 0d84866..799dbe4 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierChannelController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierChannelController.java
@@ -1,14 +1,12 @@
 package com.qs.serve.modules.bms.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.bms.entity.BmsChannel;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.entity.bo.BmsSupplierChannelBo;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierChannelPointController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierChannelPointController.java
index 7b0428a..431e7dc 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierChannelPointController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierChannelPointController.java
@@ -1,28 +1,20 @@
 package com.qs.serve.modules.bms.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.bms.entity.BmsChannel;
 import com.qs.serve.modules.bms.entity.BmsChannelPoint;
-import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.entity.BmsSupplierChannel;
-import com.qs.serve.modules.bms.entity.bo.BmsSupplierChannelBo;
 import com.qs.serve.modules.bms.service.BmsChannelPointService;
 import com.qs.serve.modules.bms.service.BmsChannelService;
 import com.qs.serve.modules.bms.service.BmsSupplierChannelService;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
-import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierContactsController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierContactsController.java
index aed4e2e..5f2d93e 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierContactsController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierContactsController.java
@@ -2,21 +2,21 @@ package com.qs.serve.modules.bms.controller;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
-import com.qs.serve.modules.sys.common.enums.BusinessLogOption;
 import com.qs.serve.modules.sys.common.enums.BusinessLogType;
-import com.qs.serve.modules.sys.entity.SysBusinessLog;
 import com.qs.serve.modules.sys.service.SysBusinessLogService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import com.qs.serve.modules.bms.entity.so.BmsSupplierContactsSo;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java
index 98f23b1..de70850 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java
@@ -4,14 +4,19 @@ import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
-import com.qs.serve.common.framework.redis.RedisService;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.consts.RedisCacheKeys;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.consts.RedisCacheKeys;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
+import com.qs.serve.common.utils.TreeUtil;
 import com.qs.serve.modules.bir.entity.so.BirBudgetTargetSo;
 import com.qs.serve.modules.bir.service.BirBudgetTargetService;
 import com.qs.serve.modules.bms.controller.my.BmsSupplierMyController;
@@ -19,7 +24,6 @@ import com.qs.serve.modules.bms.entity.*;
 import com.qs.serve.modules.bms.entity.bo.BmsSupplierBo;
 import com.qs.serve.modules.bms.entity.bo.BmsSupplierExcelBo;
 import com.qs.serve.modules.bms.entity.bo.BmsSupplierParentBo;
-import com.qs.serve.modules.bms.entity.vo.BmsRegionTreeVo;
 import com.qs.serve.modules.bms.entity.vo.BmsSupplierTreeVo;
 import com.qs.serve.modules.bms.mapper.BmsSupplierComRegionMapper;
 import com.qs.serve.modules.bms.mapper.BmsSupplierMapper;
@@ -27,7 +31,6 @@ import com.qs.serve.modules.bms.service.*;
 import com.qs.serve.modules.his.entity.HisUserSupplier;
 import com.qs.serve.modules.his.service.HisUserSupplierService;
 import com.qs.serve.modules.his.service.impl.HisUserSupplierServiceImpl;
-import com.qs.serve.modules.sys.entity.SysPostUser;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.sys.entity.bo.SysRelateSuppliersParam;
 import com.qs.serve.modules.sys.entity.bo.SysRelateSuppliersParam2;
@@ -43,9 +46,7 @@ import com.qs.serve.modules.tbs.service.TbsActivityTemplateService;
 import com.qs.serve.modules.tbs.service.TbsBudgetService;
 import com.qs.serve.modules.tbs.service.TbsCostApplyService;
 import lombok.AllArgsConstructor;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierStatementController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierStatementController.java
index 5acae2c..8e0c714 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierStatementController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierStatementController.java
@@ -1,17 +1,14 @@
 package com.qs.serve.modules.bms.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import com.qs.serve.modules.bms.entity.BmsSupplierStatement;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitAddressController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitAddressController.java
index 2a38168..0e5e4e6 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitAddressController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitAddressController.java
@@ -2,12 +2,14 @@ package com.qs.serve.modules.bms.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.baz.common.BazTargetTypeConsts;
 import com.qs.serve.modules.baz.entity.BazVisitInfo;
 import com.qs.serve.modules.baz.service.BazVisitFlowService;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitFormController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitFormController.java
index e55ab5f..a95294d 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitFormController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitFormController.java
@@ -1,13 +1,13 @@
 package com.qs.serve.modules.bms.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.baz.entity.BazVisitFlow;
 import com.qs.serve.modules.baz.service.BazVisitFlowService;
 import lombok.AllArgsConstructor;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitTypeController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitTypeController.java
index 3a5ced5..9a812b0 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitTypeController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierVisitTypeController.java
@@ -1,15 +1,13 @@
 package com.qs.serve.modules.bms.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
-import com.qs.serve.modules.bms.entity.BmsSupplierVisitForm;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bms.service.BmsSupplierVisitFormService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/api/BmsRegionApi.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/api/BmsRegionApi.java
index c836ec9..cddda89 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/api/BmsRegionApi.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/api/BmsRegionApi.java
@@ -1,6 +1,6 @@
 package com.qs.serve.modules.bms.controller.api;
 
-import com.qs.serve.common.model.dto.R;
+import com.qs.serve.framework.base.model.R;
 import com.qs.serve.modules.bms.entity.BmsRegion;
 import com.qs.serve.modules.bms.entity.vo.BmsRegionTreeVo;
 import com.qs.serve.modules.bms.service.BmsRegionService;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/api/BmsSupplierAddressApi.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/api/BmsSupplierAddressApi.java
index df20d7d..02c8b24 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/api/BmsSupplierAddressApi.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/api/BmsSupplierAddressApi.java
@@ -1,10 +1,10 @@
 package com.qs.serve.modules.bms.controller.api;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.entity.BmsSupplierAddress;
 import com.qs.serve.modules.bms.service.BmsSupplierAddressService;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/api/BmsSupplierApi.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/api/BmsSupplierApi.java
index c4c97cd..c805782 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/api/BmsSupplierApi.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/api/BmsSupplierApi.java
@@ -1,13 +1,10 @@
 package com.qs.serve.modules.bms.controller.api;
 
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.TreeUtil;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.TreeUtil;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.entity.vo.BmsSupplierTreeVo;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
@@ -15,7 +12,6 @@ import com.qs.serve.modules.wx.entity.WxUser;
 import com.qs.serve.modules.wx.service.WxUserService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/api/BmsSupplierBandApi.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/api/BmsSupplierBandApi.java
index 0220194..c8e6888 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/api/BmsSupplierBandApi.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/api/BmsSupplierBandApi.java
@@ -1,10 +1,10 @@
 package com.qs.serve.modules.bms.controller.api;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.entity.BmsSupplierBand;
 import com.qs.serve.modules.bms.service.BmsSupplierBandService;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelMyController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelMyController.java
index f4a949a..140c286 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelMyController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelMyController.java
@@ -1,11 +1,11 @@
 package com.qs.serve.modules.bms.controller.my;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.framework.base.util.CollectionUtil;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.bms.common.MasterUserType;
 import com.qs.serve.modules.bms.entity.*;
 import com.qs.serve.modules.bms.service.*;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelPointMyController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelPointMyController.java
index 479d3db..350fc75 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelPointMyController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/my/BmsChannelPointMyController.java
@@ -1,11 +1,12 @@
 package com.qs.serve.modules.bms.controller.my;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.LimitSubmit;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.dto.RowParam;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.annotation.LimitSubmit;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.model.dto.RowParam;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.baz.service.BazVisitInfoService;
 import com.qs.serve.modules.bms.entity.*;
 import com.qs.serve.modules.bms.mapper.BmsChannelPointMapper;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/my/BmsSupplierContactsMyController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/my/BmsSupplierContactsMyController.java
index 1cbc059..00e83b2 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/my/BmsSupplierContactsMyController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/my/BmsSupplierContactsMyController.java
@@ -1,31 +1,20 @@
 package com.qs.serve.modules.bms.controller.my;
 
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.github.pagehelper.PageHelper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.*;
-import com.qs.serve.modules.bms.entity.BmsSupplier;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.bms.entity.BmsSupplierContacts;
-import com.qs.serve.modules.bms.entity.bo.BmsSupplierContactsBo;
 import com.qs.serve.modules.bms.entity.so.BmsSupplierContactsSo;
 import com.qs.serve.modules.bms.service.BmsSupplierContactsService;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
-import com.qs.serve.modules.his.entity.HisUserSupplier;
 import com.qs.serve.modules.his.service.HisUserSupplierService;
-import com.qs.serve.modules.sys.common.enums.BusinessLogType;
-import com.qs.serve.modules.sys.service.SysBusinessLogService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 基础档案 供应商联系人
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/my/BmsSupplierMyController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/my/BmsSupplierMyController.java
index 76f7b53..fb55a73 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/my/BmsSupplierMyController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/controller/my/BmsSupplierMyController.java
@@ -1,9 +1,11 @@
 package com.qs.serve.modules.bms.controller.my;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.*;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bms.entity.BmsRegion;
 import com.qs.serve.modules.bms.entity.BmsRegion2;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/BmsChannelPoint.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/BmsChannelPoint.java
index e8f1d48..b1b060d 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/BmsChannelPoint.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/BmsChannelPoint.java
@@ -12,8 +12,8 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
-import com.qs.serve.common.model.annotation.BusinessDifference;
+import com.qs.serve.mbp.handler.SplitStringTypeHandler;
+import com.qs.serve.common.annotation.BusinessDifference;
 import lombok.Data;
 import org.apache.ibatis.type.JdbcType;
 import org.hibernate.validator.constraints.Length;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/BmsRegion.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/BmsRegion.java
index 2c58e9d..3904551 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/BmsRegion.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/BmsRegion.java
@@ -7,14 +7,12 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
+import com.qs.serve.mbp.handler.SplitStringTypeHandler;
 import lombok.Data;
 import org.apache.ibatis.type.JdbcType;
 import org.hibernate.validator.constraints.Length;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
 import java.util.List;
 
 /**
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/BmsRegion2.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/BmsRegion2.java
index 7bf9e64..452d325 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/BmsRegion2.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/BmsRegion2.java
@@ -4,9 +4,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
 import lombok.Data;
-import org.apache.ibatis.type.JdbcType;
 import org.hibernate.validator.constraints.Length;
 import org.springframework.format.annotation.DateTimeFormat;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java
index 7f5a2f1..7425d47 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java
@@ -12,8 +12,8 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.utils.StringUtils;
+import com.qs.serve.mbp.handler.SplitStringTypeHandler;
 import com.qs.serve.modules.his.entity.HisUserSupplier;
 import com.qs.serve.modules.his.entity.HisUserSupplierTemp;
 import com.qs.serve.modules.tag.entity.so.TagQuery;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierContacts.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierContacts.java
index c48dff7..feb5c7a 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierContacts.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierContacts.java
@@ -1,8 +1,6 @@
 package com.qs.serve.modules.bms.entity;
 
-import java.time.LocalDate;
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 import com.baomidou.mybatisplus.annotation.*;
@@ -13,14 +11,11 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import com.qs.serve.common.model.annotation.BusinessDifference;
+import com.qs.serve.common.annotation.BusinessDifference;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
-
 /**
  * 供应商联系人 实体类
  * @author YenHex
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierVisitAddress.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierVisitAddress.java
index f398d99..e67f03f 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierVisitAddress.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/BmsSupplierVisitAddress.java
@@ -1,8 +1,6 @@
 package com.qs.serve.modules.bms.entity;
 
-import java.time.LocalDate;
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 import com.baomidou.mybatisplus.annotation.*;
@@ -13,8 +11,8 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
-import com.qs.serve.common.model.annotation.BusinessDifference;
+import com.qs.serve.mbp.handler.SplitStringTypeHandler;
+import com.qs.serve.common.annotation.BusinessDifference;
 import lombok.Data;
 import org.apache.ibatis.type.JdbcType;
 import org.hibernate.validator.constraints.Length;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsChannelPoint4ExcelBo.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsChannelPoint4ExcelBo.java
index 81fddaa..57438b3 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsChannelPoint4ExcelBo.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsChannelPoint4ExcelBo.java
@@ -1,25 +1,10 @@
 package com.qs.serve.modules.bms.entity.bo;
 
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
-import com.qs.serve.common.model.annotation.BusinessDifference;
+import com.qs.serve.common.annotation.BusinessDifference;
 import lombok.Data;
-import org.apache.ibatis.type.JdbcType;
 import org.hibernate.validator.constraints.Length;
-import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.List;
 
 /**
  * 渠道站点 实体类
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsChannelPointBo.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsChannelPointBo.java
index 5198fbc..9107679 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsChannelPointBo.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsChannelPointBo.java
@@ -3,7 +3,7 @@ package com.qs.serve.modules.bms.entity.bo;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
+import com.qs.serve.mbp.handler.SplitStringTypeHandler;
 import lombok.Data;
 import org.apache.ibatis.type.JdbcType;
 import org.hibernate.validator.constraints.Length;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierBo.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierBo.java
index f840d63..f959220 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierBo.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierBo.java
@@ -1,13 +1,10 @@
 package com.qs.serve.modules.bms.entity.bo;
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
+import com.qs.serve.mbp.handler.SplitStringTypeHandler;
 import lombok.Data;
-import org.apache.ibatis.type.JdbcType;
 import org.hibernate.validator.constraints.Length;
 import org.springframework.format.annotation.DateTimeFormat;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierExcelBo.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierExcelBo.java
index e7b5f02..891e358 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierExcelBo.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierExcelBo.java
@@ -1,7 +1,7 @@
 package com.qs.serve.modules.bms.entity.bo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bms.entity.BmsRegion;
 import com.qs.serve.modules.bms.entity.BmsRegion2;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
@@ -9,7 +9,6 @@ import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/so/BmsSupplierSo.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/so/BmsSupplierSo.java
index f32d8c9..a8a8c93 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/so/BmsSupplierSo.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/so/BmsSupplierSo.java
@@ -1,22 +1,12 @@
 package com.qs.serve.modules.bms.entity.so;
 
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
-import com.qs.serve.modules.his.entity.HisUserSupplier;
 import lombok.Data;
-import org.apache.ibatis.type.JdbcType;
 import org.hibernate.validator.constraints.Length;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.List;
 
 /**
  * 供应商 实体类
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsCenterExtendTreeVo.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsCenterExtendTreeVo.java
index 027a47b..dbe7688 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsCenterExtendTreeVo.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsCenterExtendTreeVo.java
@@ -1,11 +1,8 @@
 package com.qs.serve.modules.bms.entity.vo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.SqlCondition;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.qs.serve.common.model.dto.TreeNode;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 import org.springframework.format.annotation.DateTimeFormat;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsCostCenterTreeVo.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsCostCenterTreeVo.java
index 6091292..863f60c 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsCostCenterTreeVo.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsCostCenterTreeVo.java
@@ -1,8 +1,6 @@
 package com.qs.serve.modules.bms.entity.vo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.qs.serve.common.model.dto.TreeNode;
+import com.qs.serve.framework.base.model.TreeNode;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsRegionTreeVo.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsRegionTreeVo.java
index 6b7a088..8f09e9a 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsRegionTreeVo.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsRegionTreeVo.java
@@ -1,8 +1,9 @@
 package com.qs.serve.modules.bms.entity.vo;
 
-import com.qs.serve.common.model.dto.TreeNode;
+import com.qs.serve.framework.base.model.TreeNode;
 import com.qs.serve.modules.bms.entity.BmsRegionUser;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Length;
 
 import java.util.List;
@@ -12,6 +13,7 @@ import java.util.List;
  * @since 2022/10/10
  */
 @Data
+@EqualsAndHashCode(callSuper=false)
 public class BmsRegionTreeVo extends TreeNode {
 
     /** id */
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsSubjectTreeVo.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsSubjectTreeVo.java
index ce3ed1f..ced84e8 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsSubjectTreeVo.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsSubjectTreeVo.java
@@ -1,8 +1,6 @@
 package com.qs.serve.modules.bms.entity.vo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.qs.serve.common.model.dto.TreeNode;
+import com.qs.serve.framework.base.model.TreeNode;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsSupplierTreeVo.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsSupplierTreeVo.java
index 6a07e65..3caf39b 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsSupplierTreeVo.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/entity/vo/BmsSupplierTreeVo.java
@@ -1,19 +1,11 @@
 package com.qs.serve.modules.bms.entity.vo;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.qs.serve.common.model.dto.TreeNode;
+import com.qs.serve.framework.base.model.TreeNode;
 import lombok.Data;
-import org.hibernate.validator.constraints.Length;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotBlank;
-import java.time.LocalDateTime;
 
 /**
  * @author YenHex
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/mapper/BmsChannelPointMapper.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/mapper/BmsChannelPointMapper.java
index 0f43582..51f7e68 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/mapper/BmsChannelPointMapper.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/mapper/BmsChannelPointMapper.java
@@ -4,8 +4,7 @@ package com.qs.serve.modules.bms.mapper;
 import java.util.List;
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.RowParam;
+import com.qs.serve.framework.base.model.dto.RowParam;
 import com.qs.serve.modules.bms.entity.BmsChannelPoint;
 import com.qs.serve.modules.bms.entity.so.BmsPointVisitSo;
 import com.qs.serve.modules.bms.entity.vo.BmsUserPoint4VisitVo;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/BmsChannelPointService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/BmsChannelPointService.java
index a409c59..5554b77 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/BmsChannelPointService.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/BmsChannelPointService.java
@@ -1,13 +1,10 @@
 package com.qs.serve.modules.bms.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qs.serve.common.model.dto.RowParam;
+import com.qs.serve.framework.base.model.dto.RowParam;
 import com.qs.serve.modules.bms.entity.BmsChannelPoint;
 import com.qs.serve.modules.bms.entity.bo.BmsChannelPointBo;
-import org.apache.ibatis.annotations.Param;
 
-import java.util.Collection;
 import java.util.List;
 
 /**
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/BmsRuleMainService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/BmsRuleMainService.java
index 0191a09..a6b42eb 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/BmsRuleMainService.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/BmsRuleMainService.java
@@ -1,20 +1,14 @@
 package com.qs.serve.modules.bms.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.framework.base.util.CollectionUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bms.entity.BmsRuleRegion;
 import com.qs.serve.modules.bms.entity.BmsRuleSku;
 import com.qs.serve.modules.bms.entity.BmsSkuSupplier;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.goods.entity.GoodsSku;
-import com.qs.serve.modules.goods.service.GoodsSkuService;
-import com.qs.serve.modules.goods.service.GoodsSkuSpecValueService;
-import com.qs.serve.modules.goods.service.GoodsSpuService;
-import com.qs.serve.modules.oms.service.OmsShoppingCartService;
-import com.qs.serve.modules.wx.service.WxUserService;
 import lombok.AllArgsConstructor;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsAccountUserServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsAccountUserServiceImpl.java
index f477be5..6ac6ce5 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsAccountUserServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsAccountUserServiceImpl.java
@@ -2,7 +2,6 @@ package com.qs.serve.modules.bms.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.util.Assert;
 import com.qs.serve.modules.bms.entity.BmsAccount;
 import com.qs.serve.modules.bms.entity.bo.BmsAccountUserBo;
 import com.qs.serve.modules.bms.mapper.BmsAccountMapper;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsApplyMessageServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsApplyMessageServiceImpl.java
index cf7efb1..163d245 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsApplyMessageServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsApplyMessageServiceImpl.java
@@ -2,9 +2,8 @@ package com.qs.serve.modules.bms.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.model.consts.ApplyTypeConst;
-import com.qs.serve.common.util.JsonUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.framework.base.model.consts.ApplyTypeConst;
+import com.qs.serve.framework.base.util.JsonUtil;
 import com.qs.serve.modules.bms.entity.bo.BmsApplyMessageTestBo;
 import com.qs.serve.modules.tbs.service.TbsCostApplyService;
 import com.qs.serve.modules.vtb.service.VtbVerificationService;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsCenterExtendBuildServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsCenterExtendBuildServiceImpl.java
index 4b6c697..23d81b7 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsCenterExtendBuildServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsCenterExtendBuildServiceImpl.java
@@ -1,8 +1,7 @@
 package com.qs.serve.modules.bms.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.model.dto.TreeNode;
-import com.qs.serve.common.util.CollectionUtil;
+import com.qs.serve.framework.base.util.CollectionUtil;
 import com.qs.serve.modules.bms.common.CenterExtendBuildType;
 import com.qs.serve.modules.bms.entity.vo.BmsCenterExtendTreeVo;
 import com.qs.serve.modules.bms.service.BmsCenterExtendService;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsCenterExtendServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsCenterExtendServiceImpl.java
index adc2d6d..b3135cf 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsCenterExtendServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsCenterExtendServiceImpl.java
@@ -2,11 +2,9 @@ package com.qs.serve.modules.bms.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.util.Assert;
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.common.util.TreeUtil;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.util.CollectionUtil;
 import com.qs.serve.modules.bms.entity.BmsCenterExtendUser;
-import com.qs.serve.modules.bms.entity.BmsCostCenter;
 import com.qs.serve.modules.bms.entity.bo.BmsCenterExtendBo;
 import com.qs.serve.modules.bms.entity.vo.BmsCenterExtendTreeVo;
 import com.qs.serve.modules.bms.mapper.*;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsChannelPointServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsChannelPointServiceImpl.java
index 7d5273a..e0d7f2b 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsChannelPointServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsChannelPointServiceImpl.java
@@ -2,11 +2,11 @@ package com.qs.serve.modules.bms.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.model.dto.RowParam;
-import com.qs.serve.common.util.Assert;
+import com.qs.serve.framework.base.model.dto.RowParam;
+import com.qs.serve.common.exception.Assert;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bms.common.MasterUserType;
 import com.qs.serve.modules.bms.entity.*;
 import com.qs.serve.modules.bms.entity.bo.BmsChannelPointBo;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegion2ServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegion2ServiceImpl.java
index 54f1269..0472894 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegion2ServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegion2ServiceImpl.java
@@ -2,9 +2,12 @@ package com.qs.serve.modules.bms.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.model.dto.TreeNode;
-import com.qs.serve.common.util.*;
-import com.qs.serve.modules.bms.entity.BmsRegion;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.model.TreeNode;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.StringUtils;
+import com.qs.serve.common.utils.TreeUtil;
 import com.qs.serve.modules.bms.entity.BmsRegion2;
 import com.qs.serve.modules.bms.entity.BmsRegionUser;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegionServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegionServiceImpl.java
index a805b87..bde5b77 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegionServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegionServiceImpl.java
@@ -2,18 +2,19 @@ package com.qs.serve.modules.bms.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.model.dto.TreeNode;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.model.TreeNode;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.StringUtils;
+import com.qs.serve.common.utils.TreeUtil;
 import com.qs.serve.modules.bms.common.FactoryIdOperation;
 import com.qs.serve.modules.bms.entity.*;
 import com.qs.serve.modules.bms.entity.vo.BmsRegionTreeVo;
 import com.qs.serve.modules.bms.mapper.BmsChannelPointMapper;
-import com.qs.serve.modules.bms.mapper.BmsFactoryMapper;
 import com.qs.serve.modules.bms.mapper.BmsSupplierMapper;
 import com.qs.serve.modules.bms.service.BmsFactoryService;
 import com.qs.serve.modules.bms.service.BmsRegionUserService;
-import com.qs.serve.modules.his.service.HisUserChannelPointService;
-import com.qs.serve.modules.his.service.HisUserSupplierService;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.sys.service.SysUserService;
 import lombok.AllArgsConstructor;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRuleSkuServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRuleSkuServiceImpl.java
index ec3959e..7990db6 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRuleSkuServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsRuleSkuServiceImpl.java
@@ -2,7 +2,7 @@ package com.qs.serve.modules.bms.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.util.CollectionUtil;
+import com.qs.serve.framework.base.util.CollectionUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSubjectRegionServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSubjectRegionServiceImpl.java
index ab3328d..e4e20c9 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSubjectRegionServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSubjectRegionServiceImpl.java
@@ -2,7 +2,7 @@ package com.qs.serve.modules.bms.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.util.CollectionUtil;
+import com.qs.serve.framework.base.util.CollectionUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSubjectServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSubjectServiceImpl.java
index dd77f3d..7128c70 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSubjectServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSubjectServiceImpl.java
@@ -3,10 +3,9 @@ package com.qs.serve.modules.bms.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.util.Assert;
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.common.util.IdUtil;
-import com.qs.serve.modules.bms.entity.BmsRegion2;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.util.CollectionUtil;
+import com.qs.serve.framework.base.util.IdUtil;
 import com.qs.serve.modules.tbs.entity.bo.TbsBudgetBatchBo;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -18,7 +17,6 @@ import com.qs.serve.modules.bms.mapper.BmsSubjectMapper;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collector;
 import java.util.stream.Collectors;
 
 /**
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierApplicationService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierApplicationService.java
index 0f41785..a2f4a98 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierApplicationService.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierApplicationService.java
@@ -1,33 +1,13 @@
 package com.qs.serve.modules.bms.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.enums.BudgetLogOptFlag;
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.modules.bms.entity.BmsRegion;
-import com.qs.serve.modules.bms.entity.BmsRegion2;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
-import com.qs.serve.modules.bms.mapper.BmsRegion2Mapper;
-import com.qs.serve.modules.bms.mapper.BmsRegionMapper;
 import com.qs.serve.modules.bms.mapper.BmsSupplierMapper;
 import com.qs.serve.modules.sys.entity.SysUser;
-import com.qs.serve.modules.sys.mapper.SysUserMapper;
-import com.qs.serve.modules.tbs.common.TbsCenterType;
-import com.qs.serve.modules.tbs.common.TbsGoodsType;
-import com.qs.serve.modules.tbs.common.util.TbsBudgetLogBuildUtil;
-import com.qs.serve.modules.tbs.entity.*;
-import com.qs.serve.modules.tbs.mapper.TbsActivityMapper;
-import com.qs.serve.modules.tbs.mapper.TbsBudgetConditionMapper;
-import com.qs.serve.modules.tbs.mapper.TbsBudgetMapper;
-import com.qs.serve.modules.tbs.mapper.TbsScheduleItemBudgetMapper;
-import com.qs.serve.modules.tbs.service.TbsBudgetLogService;
-import com.qs.serve.modules.tbs.service.TbsCostUnItemService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDateTime;
-import java.time.LocalTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierServiceImpl.java
index 7b72a0f..a72562d 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierServiceImpl.java
@@ -2,9 +2,12 @@ package com.qs.serve.modules.bms.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.model.dto.R;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.tag.util.TagFiledUtil;
-import com.qs.serve.common.util.*;
+import com.qs.serve.framework.base.util.*;
 import com.qs.serve.modules.bms.entity.BmsRegion;
 import com.qs.serve.modules.bms.entity.BmsRegion2;
 import com.qs.serve.modules.bms.entity.bo.BmsSupplierBatchBo;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierStatementServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierStatementServiceImpl.java
index fcd50ff..1797620 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierStatementServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierStatementServiceImpl.java
@@ -2,7 +2,7 @@ package com.qs.serve.modules.bms.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.util.Assert;
+import com.qs.serve.common.exception.Assert;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
 import lombok.AllArgsConstructor;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/data/controller/DataAffairCommitController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/data/controller/DataAffairCommitController.java
index fe9da94..7e72599 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/data/controller/DataAffairCommitController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/data/controller/DataAffairCommitController.java
@@ -1,14 +1,14 @@
 package com.qs.serve.modules.data.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.StringUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/data/controller/DataSignetController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/data/controller/DataSignetController.java
index e0315bd..132b8a1 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/data/controller/DataSignetController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/data/controller/DataSignetController.java
@@ -1,11 +1,10 @@
 package com.qs.serve.modules.data.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.dto.R;
+import com.qs.serve.framework.base.model.R;
 import com.qs.serve.modules.data.mapper.DataSignetMapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import com.qs.serve.modules.data.entity.DataSignet;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/data/entity/DataAffairCommit.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/data/entity/DataAffairCommit.java
index 51c453b..6a41600 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/data/entity/DataAffairCommit.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/data/entity/DataAffairCommit.java
@@ -1,8 +1,6 @@
 package com.qs.serve.modules.data.entity;
 
-import java.time.LocalDate;
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -10,15 +8,12 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
+import com.qs.serve.mbp.handler.SplitStringTypeHandler;
 import lombok.Data;
 import org.apache.ibatis.type.JdbcType;
 import org.hibernate.validator.constraints.Length;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
-
 /**
  *  实体类
  * @author YenHex
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/erp/controller/ErpCustomerController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/erp/controller/ErpCustomerController.java
index 525e9e4..2e490d9 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/erp/controller/ErpCustomerController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/erp/controller/ErpCustomerController.java
@@ -1,6 +1,6 @@
 package com.qs.serve.modules.erp.controller;
 
-import com.qs.serve.common.model.dto.R;
+import com.qs.serve.framework.base.model.R;
 import com.qs.serve.modules.sync.AsyncFactory;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/erp/service/impl/ErpCustomerServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/erp/service/impl/ErpCustomerServiceImpl.java
index 70c73d4..1d76743 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/erp/service/impl/ErpCustomerServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/erp/service/impl/ErpCustomerServiceImpl.java
@@ -1,7 +1,7 @@
 package com.qs.serve.modules.erp.service.impl;
 
-import com.qs.serve.common.framework.manager.AsyncManager;
-import com.qs.serve.common.framework.redis.RedisService;
+import com.qs.serve.framework.base.framework.manager.AsyncManager;
+import com.qs.serve.framework.base.framework.redis.RedisService;
 import com.qs.serve.modules.sync.AsyncFactory;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
 import com.qs.serve.modules.erp.entity.dto.ErpCustomerAmountResult;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/excel/controller/DateCheckApplyController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/excel/controller/DateCheckApplyController.java
index fa8d15b..278cd07 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/excel/controller/DateCheckApplyController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/excel/controller/DateCheckApplyController.java
@@ -1,12 +1,12 @@
 package com.qs.serve.modules.excel.controller;
 
-import com.qs.serve.common.model.annotation.RepeatSubmit;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.consts.SysConfigKey;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.Assert;
+import com.qs.serve.common.annotation.RepeatSubmit;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.consts.SysConfigKey;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.exception.Assert;
 import com.qs.serve.modules.excel.common.DataSupplierSo;
 import com.qs.serve.modules.excel.entity.DataCheckApplyDetailInfo;
 import com.qs.serve.modules.excel.entity.DataCheckApplyMainInfo;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/excel/entity/DataPayMainInfo.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/excel/entity/DataPayMainInfo.java
index dcc7552..926be59 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/excel/entity/DataPayMainInfo.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/excel/entity/DataPayMainInfo.java
@@ -1,7 +1,6 @@
 package com.qs.serve.modules.excel.entity;
 
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.modules.vtb.entity.dto.PayPaymentItemExtend;
+import com.qs.serve.framework.base.model.PageVo;
 import lombok.Data;
 
 import java.math.BigDecimal;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/excel/service/DateCheckApplyService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/excel/service/DateCheckApplyService.java
index 68a3796..671bbbc 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/excel/service/DateCheckApplyService.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/excel/service/DateCheckApplyService.java
@@ -1,11 +1,9 @@
 package com.qs.serve.modules.excel.service;
 
-import com.qs.serve.common.model.dto.PageVo;
 import com.qs.serve.modules.excel.common.DataSupplierSo;
 import com.qs.serve.modules.excel.entity.DataCheckApplyDetailInfo;
 import com.qs.serve.modules.excel.entity.DataCheckApplyMainInfo;
 import com.qs.serve.modules.excel.entity.DataPayMainInfo;
-import com.qs.serve.modules.vtb.entity.dto.PayPaymentItemExtend;
 import com.qs.serve.modules.vtb.entity.so.PayPaymentItemExtendSo;
 
 /**
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/excel/service/impl/DateCheckApplyServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/excel/service/impl/DateCheckApplyServiceImpl.java
index 73face2..46608ab 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/excel/service/impl/DateCheckApplyServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/excel/service/impl/DateCheckApplyServiceImpl.java
@@ -1,10 +1,9 @@
 package com.qs.serve.modules.excel.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.RowParam;
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.dto.RowParam;
+import com.qs.serve.framework.base.util.CollectionUtil;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.entity.BmsSupplierContacts;
 import com.qs.serve.modules.bms.mapper.BmsSupplierMapper;
@@ -15,18 +14,12 @@ import com.qs.serve.modules.excel.entity.DataCheckApplyDetailItem;
 import com.qs.serve.modules.excel.entity.DataCheckApplyMainInfo;
 import com.qs.serve.modules.excel.entity.DataPayMainInfo;
 import com.qs.serve.modules.excel.service.DateCheckApplyService;
-import com.qs.serve.modules.pay.common.PaymentType;
-import com.qs.serve.modules.pay.entity.PayPaymentItem;
 import com.qs.serve.modules.pay.mapper.PayPaymentItemMapper;
 import com.qs.serve.modules.tbs.common.TbsCostApplyState;
-import com.qs.serve.modules.tbs.entity.TbsActivity;
 import com.qs.serve.modules.tbs.entity.TbsCostApply;
-import com.qs.serve.modules.tbs.entity.vo.TbsCostApplySumAmountVo;
 import com.qs.serve.modules.tbs.mapper.TbsActivityMapper;
 import com.qs.serve.modules.tbs.mapper.TbsCostApplyMapper;
 import com.qs.serve.modules.tbs.mapper.TbsCostApplySumAmountMapper;
-import com.qs.serve.modules.vtb.common.VtbVerificationState;
-import com.qs.serve.modules.vtb.entity.VtbVerification;
 import com.qs.serve.modules.vtb.entity.dto.PayPaymentItemExtend;
 import com.qs.serve.modules.vtb.entity.so.PayPaymentItemExtendSo;
 import com.qs.serve.modules.vtb.mapper.VtbVerForPayReportMapper;
@@ -36,10 +29,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.time.LocalDate;
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/exl/common/TableCreateSqlUtil.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/exl/common/TableCreateSqlUtil.java
index c3d6a8d..969cc51 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/exl/common/TableCreateSqlUtil.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/exl/common/TableCreateSqlUtil.java
@@ -1,7 +1,7 @@
 package com.qs.serve.modules.exl.common;
 
 import com.alibaba.fastjson.JSONObject;
-import com.qs.serve.common.util.Assert;
+import com.qs.serve.common.exception.Assert;
 import com.qs.serve.modules.exl.entity.ExlColumnConf;
 
 import java.util.HashMap;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/exl/controller/ExlTableConfController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/exl/controller/ExlTableConfController.java
index ecb8fa8..3c9f31d 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/exl/controller/ExlTableConfController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/exl/controller/ExlTableConfController.java
@@ -1,12 +1,13 @@
 package com.qs.serve.modules.exl.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.exl.common.ExlConst;
 import com.qs.serve.modules.exl.common.QsSqlSessionUtil;
 import com.qs.serve.modules.exl.common.TableCreateSqlUtil;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/exl/controller/ExlTableDataController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/exl/controller/ExlTableDataController.java
index 3746e49..f85ed10 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/exl/controller/ExlTableDataController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/exl/controller/ExlTableDataController.java
@@ -2,9 +2,11 @@ package com.qs.serve.modules.exl.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.*;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.mapper.BmsSupplierMapper;
 import com.qs.serve.modules.exl.common.ExlConst;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/exl/service/impl/ExlTableConfServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/exl/service/impl/ExlTableConfServiceImpl.java
index 8235da2..ee0a468 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/exl/service/impl/ExlTableConfServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/exl/service/impl/ExlTableConfServiceImpl.java
@@ -2,7 +2,7 @@ package com.qs.serve.modules.exl.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.util.Assert;
+import com.qs.serve.common.exception.Assert;
 import com.qs.serve.modules.exl.common.ExlConst;
 import com.qs.serve.modules.exl.entity.ExlColumnConf;
 import com.qs.serve.modules.exl.entity.bo.ExlTableUserBo;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/exl/service/impl/ExlTableUserServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/exl/service/impl/ExlTableUserServiceImpl.java
index c2d4086..daa732f 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/exl/service/impl/ExlTableUserServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/exl/service/impl/ExlTableUserServiceImpl.java
@@ -2,7 +2,7 @@ package com.qs.serve.modules.exl.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.util.CollectionUtil;
+import com.qs.serve.framework.base.util.CollectionUtil;
 import com.qs.serve.modules.exl.entity.bo.ExlTableUserBo;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.sys.mapper.SysUserMapper;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/common/GoodsSpuColumnUtil.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/common/GoodsSpuColumnUtil.java
index 0e6da58..793060c 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/common/GoodsSpuColumnUtil.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/common/GoodsSpuColumnUtil.java
@@ -1,6 +1,6 @@
 package com.qs.serve.modules.goods.common;
 
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.utils.StringUtils;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsAccreditController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsAccreditController.java
index 5d63d58..8fdefe8 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsAccreditController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsAccreditController.java
@@ -1,26 +1,19 @@
 package com.qs.serve.modules.goods.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
 import com.qs.serve.modules.goods.entity.bo.GoodsAccreditBo;
 import com.qs.serve.modules.goods.entity.bo.GoodsAccreditImportBo;
-import com.qs.serve.modules.goods.entity.dto.GoodsAccreditExt;
 import com.qs.serve.modules.goods.entity.dto.GoodsAccreditQuery;
 import com.qs.serve.modules.goods.entity.vo.GoodsAccreditResult;
 import com.qs.serve.modules.goods.entity.vo.GoodsAccreditVo;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import com.qs.serve.modules.goods.entity.GoodsAccredit;
 import com.qs.serve.modules.goods.service.GoodsAccreditService;
 
 import javax.validation.Valid;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsBrandController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsBrandController.java
index ca638f5..942daf0 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsBrandController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsBrandController.java
@@ -1,12 +1,12 @@
 package com.qs.serve.modules.goods.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java
index fa73a26..f65e8d4 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java
@@ -2,24 +2,25 @@ package com.qs.serve.modules.goods.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.qs.serve.common.config.DevEnvironmentConfig;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.dto.SimpleCountValue;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.*;
+import com.qs.serve.framework.base.config.DevEnvironmentConfig;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.model.dto.SimpleCountValue;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.TreeUtil;
 import com.qs.serve.modules.bms.common.BookAccountUtil;
 import com.qs.serve.modules.goods.entity.GoodsSpu;
-import com.qs.serve.modules.goods.entity.bo.GoodsCategoryBo;
 import com.qs.serve.modules.goods.entity.bo.GoodsCategoryLevelBo;
 import com.qs.serve.modules.goods.entity.bo.GoodsCategoryTreeVo;
 import com.qs.serve.modules.goods.mapper.GoodsCategoryMapper;
 import com.qs.serve.modules.goods.service.GoodsSpuService;
 import com.qs.serve.modules.tbs.common.TbsGoodsType;
-import com.qs.serve.modules.tbs.entity.TbsActivityGoods;
-import com.qs.serve.modules.tbs.entity.TbsBudgetCondition;
 import com.qs.serve.modules.tbs.service.TbsActivityGoodsService;
 import com.qs.serve.modules.tbs.service.TbsBudgetConditionService;
 import lombok.AllArgsConstructor;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryRuleController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryRuleController.java
index 45c5943..1092470 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryRuleController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryRuleController.java
@@ -1,13 +1,13 @@
 package com.qs.serve.modules.goods.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.goods.entity.bo.GoodsCategoryRuleBo;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsCustomerPriceController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsCustomerPriceController.java
index 73c6fb8..6dd8c4a 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsCustomerPriceController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsCustomerPriceController.java
@@ -1,21 +1,19 @@
 package com.qs.serve.modules.goods.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.config.DevEnvironmentConfig;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.framework.base.config.DevEnvironmentConfig;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bms.common.BookAccountUtil;
 import com.qs.serve.modules.goods.entity.bo.GoodsCustomerPriceBo;
 import com.qs.serve.modules.goods.entity.bo.GoodsCustomerPriceSingleBo;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import com.qs.serve.modules.goods.entity.GoodsCustomerPrice;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsFeedbackController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsFeedbackController.java
index 8bfb88b..ca72154 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsFeedbackController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsFeedbackController.java
@@ -3,13 +3,15 @@ package com.qs.serve.modules.goods.controller;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.dto.SimpleKeyValue;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.model.dto.SimpleKeyValue;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.StringUtils;
+import com.qs.serve.common.utils.TreeUtil;
 import com.qs.serve.modules.goods.entity.GoodsFeedbackType;
 import com.qs.serve.modules.goods.entity.GoodsSku;
 import com.qs.serve.modules.goods.entity.GoodsSpu;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsFeedbackTypeController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsFeedbackTypeController.java
index 4b9e51e..7eb6eb6 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsFeedbackTypeController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsFeedbackTypeController.java
@@ -1,22 +1,17 @@
 package com.qs.serve.modules.goods.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
-import com.qs.serve.common.util.TreeUtil;
-import com.qs.serve.modules.biz.consts.GroupDataType;
-import com.qs.serve.modules.bms.entity.vo.BmsRegionTreeVo;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.StringUtils;
+import com.qs.serve.common.utils.TreeUtil;
 import com.qs.serve.modules.goods.entity.bo.GoodsFeedbackTypeBo;
 import com.qs.serve.modules.goods.entity.vo.GoodsFeedbackTypeTreeVo;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import com.qs.serve.modules.goods.entity.GoodsFeedbackType;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsImminentBatchController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsImminentBatchController.java
index c4f09f1..719bf8d 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsImminentBatchController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsImminentBatchController.java
@@ -1,16 +1,13 @@
 package com.qs.serve.modules.goods.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.config.DevEnvironmentConfig;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.*;
-import com.qs.serve.modules.bms.common.BookAccountUtil;
-import com.qs.serve.modules.bms.entity.BmsSupplier;
-import com.qs.serve.modules.goods.entity.GoodsCategoryRule;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.goods.entity.GoodsSku;
 import com.qs.serve.modules.goods.entity.bo.GoodsImminentBatchBo;
 import com.qs.serve.modules.goods.entity.so.GoodsImminentBatchQuery;
@@ -20,14 +17,12 @@ import com.qs.serve.modules.oms.entity.OmsOrderItem;
 import com.qs.serve.modules.oms.service.OmsOrderItemService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import com.qs.serve.modules.goods.entity.GoodsImminentBatch;
 import com.qs.serve.modules.goods.service.GoodsImminentBatchService;
 
 import javax.validation.Valid;
-import java.util.Arrays;
 import java.util.List;
 
 /**
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsRuleController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsRuleController.java
index 9755a66..f7ac68e 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsRuleController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsRuleController.java
@@ -1,25 +1,18 @@
 package com.qs.serve.modules.goods.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
-import com.qs.serve.modules.goods.entity.GoodsCategory;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.goods.entity.bo.GoodsRuleBo;
 import com.qs.serve.modules.goods.entity.bo.GoodsRuleImportBo;
 import com.qs.serve.modules.goods.entity.dto.GoodsRuleBaseDTO;
 import com.qs.serve.modules.goods.entity.vo.GoodsRuleVo;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import com.qs.serve.modules.goods.entity.GoodsRule;
 import com.qs.serve.modules.goods.service.GoodsRuleService;
 
 import javax.validation.Valid;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSaleGroupController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSaleGroupController.java
index 10c48a9..8879c89 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSaleGroupController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSaleGroupController.java
@@ -1,14 +1,13 @@
 package com.qs.serve.modules.goods.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSeriesController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSeriesController.java
index 58bc34b..06a30c3 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSeriesController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSeriesController.java
@@ -1,12 +1,12 @@
 package com.qs.serve.modules.goods.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java
index 6678833..da52242 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java
@@ -1,36 +1,23 @@
 package com.qs.serve.modules.goods.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.qs.serve.common.config.DevEnvironmentConfig;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.framework.base.config.DevEnvironmentConfig;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.bms.common.BookAccountUtil;
-import com.qs.serve.modules.goods.entity.GoodsSkuSpecValue;
-import com.qs.serve.modules.goods.entity.GoodsSpu;
-import com.qs.serve.modules.goods.entity.bo.GoodsSkuBo;
-import com.qs.serve.modules.goods.entity.bo.GoodsSkuImportBo;
-import com.qs.serve.modules.goods.entity.bo.GoodsSpuImportBo;
 import com.qs.serve.modules.goods.entity.vo.GoodSkuVo;
 import com.qs.serve.modules.goods.entity.vo.GoodsSkuExportVo;
 import com.qs.serve.modules.goods.entity.vo.GoodsSkuSpecValueVo;
 import com.qs.serve.modules.goods.mapper.GoodsSkuMapper;
 import com.qs.serve.modules.goods.service.GoodsSkuSpecValueService;
 import com.qs.serve.modules.goods.service.GoodsSpuService;
-import com.qs.serve.modules.sale.entity.SalePlanGoods;
 import com.qs.serve.modules.sale.service.SalePlanGoodsService;
-import com.qs.serve.modules.tbs.common.TbsGoodsType;
-import com.qs.serve.modules.tbs.entity.TbsActivityGoods;
-import com.qs.serve.modules.tbs.entity.TbsBudgetCondition;
 import com.qs.serve.modules.tbs.service.TbsActivityGoodsService;
 import com.qs.serve.modules.tbs.service.TbsBudgetConditionService;
-import com.qs.serve.modules.tzc.entity.TzcPolicyGoods;
 import com.qs.serve.modules.tzc.service.TzcPolicyGoodsService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -41,10 +28,7 @@ import com.qs.serve.modules.goods.entity.GoodsSku;
 import com.qs.serve.modules.goods.service.GoodsSkuService;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.Random;
 import java.util.stream.Collectors;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuOptionController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuOptionController.java
index b5386e3..fad8c95 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuOptionController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuOptionController.java
@@ -2,17 +2,12 @@ package com.qs.serve.modules.goods.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.qs.serve.common.config.DevEnvironmentConfig;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.SpringUtils;
-import com.qs.serve.common.util.StringUtils;
-import com.qs.serve.modules.bms.common.BookAccountUtil;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.framework.base.util.SpringUtils;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.goods.entity.GoodsSku;
 import com.qs.serve.modules.goods.entity.GoodsSkuSpecValue;
 import com.qs.serve.modules.goods.entity.GoodsSpu;
@@ -20,9 +15,6 @@ import com.qs.serve.modules.goods.entity.bo.GoodsSkuBo;
 import com.qs.serve.modules.goods.entity.bo.GoodsSkuImportBo;
 import com.qs.serve.modules.goods.entity.bo.GoodsSkuSpecialBo;
 import com.qs.serve.modules.goods.entity.bo.GoodsSkuStateBo;
-import com.qs.serve.modules.goods.entity.vo.GoodSkuVo;
-import com.qs.serve.modules.goods.entity.vo.GoodsSkuExportVo;
-import com.qs.serve.modules.goods.entity.vo.GoodsSkuSpecValueVo;
 import com.qs.serve.modules.goods.mapper.GoodsSkuMapper;
 import com.qs.serve.modules.goods.mapper.GoodsSpuMapper;
 import com.qs.serve.modules.goods.service.GoodsSkuService;
@@ -41,11 +33,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
-import java.util.Random;
 import java.util.stream.Collectors;
 
 /**
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuSpecValueController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuSpecValueController.java
index 1c3b691..6e8ad86 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuSpecValueController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuSpecValueController.java
@@ -1,14 +1,12 @@
 package com.qs.serve.modules.goods.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpecController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpecController.java
index 1277fca..208fe65 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpecController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpecController.java
@@ -1,14 +1,12 @@
 package com.qs.serve.modules.goods.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpecValueController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpecValueController.java
index 2c1093d..8468b3c 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpecValueController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpecValueController.java
@@ -1,13 +1,12 @@
 package com.qs.serve.modules.goods.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.modules.goods.entity.GoodsSku;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.goods.entity.GoodsSkuSpecValue;
 import com.qs.serve.modules.goods.entity.GoodsSpec;
 import com.qs.serve.modules.goods.service.GoodsSkuSpecValueService;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java
index b1fd788..2cb2bf2 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java
@@ -3,15 +3,18 @@ package com.qs.serve.modules.goods.controller;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
-import com.qs.serve.common.config.DevEnvironmentConfig;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
+import com.qs.serve.framework.base.config.DevEnvironmentConfig;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
 import com.qs.serve.modules.tag.util.TagFiledUtil;
-import com.qs.serve.common.util.*;
+import com.qs.serve.framework.base.util.*;
 import com.qs.serve.modules.bms.common.BookAccountUtil;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuOptionController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuOptionController.java
index 8048208..a219e72 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuOptionController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuOptionController.java
@@ -3,11 +3,13 @@ package com.qs.serve.modules.goods.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
 import com.qs.serve.modules.erp.mapper.ErpDispatchDataMapper;
 import com.qs.serve.modules.goods.entity.*;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuSpecController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuSpecController.java
index 193d7f0..104ee8b 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuSpecController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuSpecController.java
@@ -1,15 +1,12 @@
 package com.qs.serve.modules.goods.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.modules.goods.entity.GoodsSpec;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSyncController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSyncController.java
index 8b259d2..92cab21 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSyncController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsSyncController.java
@@ -1,6 +1,6 @@
 package com.qs.serve.modules.goods.controller;
 
-import com.qs.serve.common.model.dto.R;
+import com.qs.serve.framework.base.model.R;
 import com.qs.serve.modules.goods.service.GoodsApplicationService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsUnitController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsUnitController.java
index 4ce5d9a..c7bc6b0 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsUnitController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/GoodsUnitController.java
@@ -1,12 +1,12 @@
 package com.qs.serve.modules.goods.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/api/GoodsBrandApi.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/api/GoodsBrandApi.java
index 8c783a1..af64015 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/api/GoodsBrandApi.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/api/GoodsBrandApi.java
@@ -1,17 +1,11 @@
 package com.qs.serve.modules.goods.controller.api;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.framework.base.model.R;
 import com.qs.serve.modules.goods.entity.GoodsBrand;
 import com.qs.serve.modules.goods.service.GoodsBrandService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/api/GoodsCategoryApi.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/api/GoodsCategoryApi.java
index ac70e72..42b1255 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/api/GoodsCategoryApi.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/api/GoodsCategoryApi.java
@@ -2,26 +2,19 @@ package com.qs.serve.modules.goods.controller.api;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.config.DevEnvironmentConfig;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.dto.TreeNode;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.TreeUtil;
+import com.qs.serve.framework.base.config.DevEnvironmentConfig;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.model.TreeNode;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.TreeUtil;
 import com.qs.serve.modules.bms.common.BookAccountUtil;
 import com.qs.serve.modules.goods.entity.GoodsCategory;
 import com.qs.serve.modules.goods.entity.bo.GoodsCategoryTreeVo;
 import com.qs.serve.modules.goods.service.GoodsCategoryService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/api/GoodsImminentBatchApi.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/api/GoodsImminentBatchApi.java
index 5e3b9e4..342d9f2 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/api/GoodsImminentBatchApi.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/api/GoodsImminentBatchApi.java
@@ -2,13 +2,13 @@ package com.qs.serve.modules.goods.controller.api;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.config.DevEnvironmentConfig;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.*;
+import com.qs.serve.framework.base.config.DevEnvironmentConfig;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.framework.base.util.*;
 import com.qs.serve.modules.bms.common.BookAccountUtil;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/api/GoodsSaleGroupApi.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/api/GoodsSaleGroupApi.java
index 111ea9e..2d249aa 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/api/GoodsSaleGroupApi.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/api/GoodsSaleGroupApi.java
@@ -1,21 +1,13 @@
 package com.qs.serve.modules.goods.controller.api;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.framework.base.model.R;
 import com.qs.serve.modules.goods.entity.GoodsSaleGroup;
 import com.qs.serve.modules.goods.service.GoodsSaleGroupService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
 import java.util.List;
 
 /**
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/api/GoodsSeriesApi.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/api/GoodsSeriesApi.java
index 157344c..b0390a0 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/api/GoodsSeriesApi.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/api/GoodsSeriesApi.java
@@ -1,20 +1,13 @@
 package com.qs.serve.modules.goods.controller.api;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.framework.base.model.R;
 import com.qs.serve.modules.goods.entity.GoodsSeries;
 import com.qs.serve.modules.goods.service.GoodsSeriesService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
 import java.util.List;
 
 /**
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/api/GoodsSpuApi.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/api/GoodsSpuApi.java
index a6f4d7a..2d03471 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/api/GoodsSpuApi.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/controller/api/GoodsSpuApi.java
@@ -1,11 +1,11 @@
 package com.qs.serve.modules.goods.controller.api;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.goods.entity.GoodsSpu;
 import com.qs.serve.modules.goods.entity.vo.GoodsSpuVo;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/GoodsCategory.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/GoodsCategory.java
index d69e815..0b471df 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/GoodsCategory.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/GoodsCategory.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.utils.StringUtils;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 import org.springframework.format.annotation.DateTimeFormat;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/GoodsCategoryRule.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/GoodsCategoryRule.java
index c29b7d9..ebb5e67 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/GoodsCategoryRule.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/GoodsCategoryRule.java
@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
+import com.qs.serve.mbp.handler.SplitStringTypeHandler;
 import lombok.Data;
 import org.apache.ibatis.type.JdbcType;
 import org.hibernate.validator.constraints.Length;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/GoodsFeedback.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/GoodsFeedback.java
index aae271e..aebeeb7 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/GoodsFeedback.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/GoodsFeedback.java
@@ -1,23 +1,18 @@
 package com.qs.serve.modules.goods.entity;
 
-import java.time.LocalDate;
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
+import com.qs.serve.mbp.handler.SplitStringTypeHandler;
 import lombok.Data;
 import org.apache.ibatis.type.JdbcType;
 import org.hibernate.validator.constraints.Length;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
-
 /**
  * 问题反馈 实体类
  * @author YenHex
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/GoodsSpu.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/GoodsSpu.java
index 3e21774..d02090e 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/GoodsSpu.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/GoodsSpu.java
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
+import com.qs.serve.mbp.handler.SplitStringTypeHandler;
 import com.qs.serve.modules.goods.entity.dto.GoodsAccrIdsDto;
 import com.qs.serve.modules.tag.entity.so.TagQuery;
 import lombok.Data;
@@ -267,7 +267,7 @@ public class GoodsSpu implements Serializable {
      */
     @TableField(exist = false)
     private String orderType;
-    
+
     /**
      * 列名
      */
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsCategoryTreeVo.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsCategoryTreeVo.java
index 17b019f..0a112b5 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsCategoryTreeVo.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsCategoryTreeVo.java
@@ -2,7 +2,7 @@ package com.qs.serve.modules.goods.entity.bo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.qs.serve.common.model.dto.TreeNode;
+import com.qs.serve.framework.base.model.TreeNode;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsFeedbackBo.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsFeedbackBo.java
index 0cddcc2..f3fb1d4 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsFeedbackBo.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsFeedbackBo.java
@@ -1,11 +1,6 @@
 package com.qs.serve.modules.goods.entity.bo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
 import lombok.Data;
-import org.apache.ibatis.type.JdbcType;
 import org.hibernate.validator.constraints.Length;
 
 /**
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSpuBo.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSpuBo.java
index d70d3d9..64323e6 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSpuBo.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSpuBo.java
@@ -3,14 +3,9 @@ package com.qs.serve.modules.goods.entity.bo;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
+import com.qs.serve.mbp.handler.SplitStringTypeHandler;
 import lombok.Data;
 import org.apache.ibatis.type.JdbcType;
-import org.hibernate.validator.constraints.Length;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
 
 /**
  * 口味品类
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSpuEditBo.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSpuEditBo.java
index fdf025e..7f2ba92 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSpuEditBo.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSpuEditBo.java
@@ -1,15 +1,12 @@
 package com.qs.serve.modules.goods.entity.bo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
+import com.qs.serve.mbp.handler.SplitStringTypeHandler;
 import lombok.Data;
 import org.apache.ibatis.type.JdbcType;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 
 /**
  * @author YenHex
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSpuImportBo.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSpuImportBo.java
index b49ae8e..2424d6b 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSpuImportBo.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSpuImportBo.java
@@ -1,11 +1,6 @@
 package com.qs.serve.modules.goods.entity.bo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
 import lombok.Data;
-import org.apache.ibatis.type.JdbcType;
 
 import java.util.List;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/vo/GoodsFeedbackTypeTreeVo.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/vo/GoodsFeedbackTypeTreeVo.java
index 60a89c5..4622dcc 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/vo/GoodsFeedbackTypeTreeVo.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/vo/GoodsFeedbackTypeTreeVo.java
@@ -1,8 +1,7 @@
 package com.qs.serve.modules.goods.entity.vo;
 
-import com.qs.serve.common.model.dto.TreeNode;
+import com.qs.serve.framework.base.model.TreeNode;
 import lombok.Data;
-import org.hibernate.validator.constraints.Length;
 
 /**
  * @author YenHex
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/vo/GoodsSpuExportVo.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/vo/GoodsSpuExportVo.java
index 46cb5a2..e2c92ec 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/vo/GoodsSpuExportVo.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/entity/vo/GoodsSpuExportVo.java
@@ -1,22 +1,9 @@
 package com.qs.serve.modules.goods.entity.vo;
 
 import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
-import com.qs.serve.modules.goods.entity.GoodsSku;
 import lombok.Data;
-import org.apache.ibatis.type.JdbcType;
-import org.hibernate.validator.constraints.Length;
-import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.List;
 
 /**
  * spu 实体类
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/mapper/GoodsCategoryMapper.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/mapper/GoodsCategoryMapper.java
index 6a62eba..4906bd3 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/mapper/GoodsCategoryMapper.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/mapper/GoodsCategoryMapper.java
@@ -1,8 +1,7 @@
 package com.qs.serve.modules.goods.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qs.serve.common.model.dto.SimpleCountValue;
+import com.qs.serve.framework.base.model.dto.SimpleCountValue;
 import com.qs.serve.modules.goods.entity.GoodsCategory;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/mapper/GoodsImminentBatchMapper.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/mapper/GoodsImminentBatchMapper.java
index d23143f..1ed6a4b 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/mapper/GoodsImminentBatchMapper.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/mapper/GoodsImminentBatchMapper.java
@@ -2,7 +2,7 @@ package com.qs.serve.modules.goods.mapper;
 
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qs.serve.common.model.dto.RowParam;
+import com.qs.serve.framework.base.model.dto.RowParam;
 import com.qs.serve.modules.goods.entity.GoodsImminentBatch;
 import com.qs.serve.modules.goods.entity.so.GoodsImminentBatchQuery;
 import com.qs.serve.modules.goods.entity.vo.GoodsImminentBatchVo;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/mapper/GoodsSpuMapper.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/mapper/GoodsSpuMapper.java
index 31ee928..2893bc8 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/mapper/GoodsSpuMapper.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/mapper/GoodsSpuMapper.java
@@ -2,7 +2,7 @@ package com.qs.serve.modules.goods.mapper;
 
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qs.serve.common.model.dto.RowParam;
+import com.qs.serve.framework.base.model.dto.RowParam;
 import com.qs.serve.modules.goods.entity.GoodsSpu;
 import com.qs.serve.modules.goods.entity.dto.GoodSpuSkuNum;
 import org.apache.ibatis.annotations.Param;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/GoodsAccreditService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/GoodsAccreditService.java
index 3e2f5b9..5150d98 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/GoodsAccreditService.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/GoodsAccreditService.java
@@ -1,20 +1,16 @@
 package com.qs.serve.modules.goods.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qs.serve.common.model.dto.PageVo;
+import com.qs.serve.framework.base.model.PageVo;
 import com.qs.serve.modules.goods.entity.GoodsAccredit;
-import com.qs.serve.modules.goods.entity.GoodsAccreditItem;
-import com.qs.serve.modules.goods.entity.GoodsRuleItem;
 import com.qs.serve.modules.goods.entity.bo.GoodsAccreditBo;
 import com.qs.serve.modules.goods.entity.bo.GoodsAccreditImportBo;
 import com.qs.serve.modules.goods.entity.dto.GoodsAccrIdsDto;
-import com.qs.serve.modules.goods.entity.dto.GoodsAccreditExt;
 import com.qs.serve.modules.goods.entity.dto.GoodsAccreditQuery;
 import com.qs.serve.modules.goods.entity.vo.GoodsAccreditResult;
 import com.qs.serve.modules.goods.entity.vo.GoodsAccreditVo;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 规则 服务接口
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/GoodsApplicationService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/GoodsApplicationService.java
index b2dbe3c..b3f1f60 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/GoodsApplicationService.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/GoodsApplicationService.java
@@ -1,10 +1,10 @@
 package com.qs.serve.modules.goods.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.dto.R;
+import com.qs.serve.framework.base.model.R;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.JsonUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.framework.base.util.JsonUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.goods.entity.GoodsCategory;
 import com.qs.serve.modules.goods.entity.GoodsSku;
 import com.qs.serve.modules.goods.entity.GoodsSpu;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/GoodsRuleService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/GoodsRuleService.java
index 01cd3ff..32db1d1 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/GoodsRuleService.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/GoodsRuleService.java
@@ -1,7 +1,7 @@
 package com.qs.serve.modules.goods.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qs.serve.common.model.dto.SimpleKeyValue;
+import com.qs.serve.framework.base.model.dto.SimpleKeyValue;
 import com.qs.serve.modules.goods.entity.GoodsRule;
 import com.qs.serve.modules.goods.entity.GoodsRuleItem;
 import com.qs.serve.modules.goods.entity.bo.GoodsRuleBo;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsAccreditServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsAccreditServiceImpl.java
index 0af1a5c..3c27352 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsAccreditServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsAccreditServiceImpl.java
@@ -3,9 +3,12 @@ package com.qs.serve.modules.goods.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bms.entity.BmsRegion;
 import com.qs.serve.modules.bms.entity.BmsRegion2;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCategoryRuleServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCategoryRuleServiceImpl.java
index 8569dda..af924d5 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCategoryRuleServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCategoryRuleServiceImpl.java
@@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.util.CopierUtil;
+import com.qs.serve.common.utils.CopierUtil;
 import com.qs.serve.modules.goods.entity.GoodsCategory;
 import com.qs.serve.modules.goods.entity.bo.GoodsCategoryRuleBo;
 import com.qs.serve.modules.goods.mapper.GoodsCategoryMapper;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCategoryServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCategoryServiceImpl.java
index 671aefe..15ac9fc 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCategoryServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCategoryServiceImpl.java
@@ -2,10 +2,10 @@ package com.qs.serve.modules.goods.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.util.Assert;
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.IdUtil;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.util.CollectionUtil;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.framework.base.util.IdUtil;
 import com.qs.serve.modules.bms.entity.BmsAccount;
 import com.qs.serve.modules.bms.mapper.BmsAccountMapper;
 import com.qs.serve.modules.goods.common.GoodsConst;
@@ -20,7 +20,6 @@ import com.qs.serve.modules.goods.entity.GoodsCategory;
 import com.qs.serve.modules.goods.service.GoodsCategoryService;
 import com.qs.serve.modules.goods.mapper.GoodsCategoryMapper;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCustomerPriceServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCustomerPriceServiceImpl.java
index 383f3bf..185acff 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCustomerPriceServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsCustomerPriceServiceImpl.java
@@ -3,10 +3,10 @@ package com.qs.serve.modules.goods.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.Assert;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.exception.Assert;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.JsonUtil;
+import com.qs.serve.framework.base.util.JsonUtil;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.mapper.BmsSupplierMapper;
 import com.qs.serve.modules.goods.entity.GoodsSku;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsFeedbackServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsFeedbackServiceImpl.java
index a81177c..9c8de5f 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsFeedbackServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsFeedbackServiceImpl.java
@@ -4,9 +4,9 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
-import com.qs.serve.common.util.TreeUtil;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.StringUtils;
+import com.qs.serve.common.utils.TreeUtil;
 import com.qs.serve.modules.goods.entity.GoodsFeedbackType;
 import com.qs.serve.modules.goods.entity.bo.GoodsFeedbackBo;
 import com.qs.serve.modules.goods.entity.so.GoodsFeedbackQuery;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsImminentBatchServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsImminentBatchServiceImpl.java
index 30332f1..c4f3e57 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsImminentBatchServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsImminentBatchServiceImpl.java
@@ -2,7 +2,7 @@ package com.qs.serve.modules.goods.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.model.dto.RowParam;
+import com.qs.serve.framework.base.model.dto.RowParam;
 import com.qs.serve.modules.goods.entity.so.GoodsImminentBatchQuery;
 import com.qs.serve.modules.goods.entity.vo.GoodsImminentBatchVo;
 import lombok.AllArgsConstructor;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsRuleServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsRuleServiceImpl.java
index 50c734d..17a3672 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsRuleServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsRuleServiceImpl.java
@@ -4,10 +4,10 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.model.dto.SimpleKeyValue;
-import com.qs.serve.common.util.Assert;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.framework.base.model.dto.SimpleKeyValue;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bms.entity.BmsRegion;
 import com.qs.serve.modules.bms.entity.BmsRegion2;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSkuServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSkuServiceImpl.java
index 78d729b..43a02e9 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSkuServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSkuServiceImpl.java
@@ -2,8 +2,11 @@ package com.qs.serve.modules.goods.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.goods.common.GoodsConst;
 import com.qs.serve.modules.goods.entity.*;
 import com.qs.serve.modules.goods.entity.bo.GoodsSkuBo;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSpuServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSpuServiceImpl.java
index 3aa9ff4..ab056c1 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSpuServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSpuServiceImpl.java
@@ -2,9 +2,13 @@ package com.qs.serve.modules.goods.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.config.properties.ProjectApisProperties;
-import com.qs.serve.common.model.dto.RowParam;
-import com.qs.serve.common.util.*;
+import com.qs.serve.framework.base.config.properties.ProjectApisProperties;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.model.dto.RowParam;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bms.entity.BmsFactory;
 import com.qs.serve.modules.bms.service.BmsFactoryService;
 import com.qs.serve.modules.goods.common.GoodsSpuColumnUtil;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/his/controller/HistFixController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/his/controller/HistFixController.java
index c8d6309..d91c6dd 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/his/controller/HistFixController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/his/controller/HistFixController.java
@@ -1,16 +1,11 @@
 package com.qs.serve.modules.his.controller;
 
-import com.qs.serve.common.config.DevEnvironmentConfig;
-import com.qs.serve.common.framework.redis.RedisService;
-import com.qs.serve.common.model.consts.RedisCacheKeys;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.modules.his.service.HisUserChannelPointService;
+import com.qs.serve.framework.base.model.R;
 import com.qs.serve.modules.his.service.HisUserSupplierService;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.sys.service.SysUserService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/his/service/HisUserSupplierService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/his/service/HisUserSupplierService.java
index 5990fcb..ccd8b2b 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/his/service/HisUserSupplierService.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/his/service/HisUserSupplierService.java
@@ -1,11 +1,10 @@
 package com.qs.serve.modules.his.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qs.serve.common.model.dto.PageVo;
+import com.qs.serve.framework.base.model.PageVo;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.his.entity.HisUserSupplier;
 
-import java.io.Serializable;
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/his/service/impl/HisUserChannelPointServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/his/service/impl/HisUserChannelPointServiceImpl.java
index 148e70b..83bb6f0 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/his/service/impl/HisUserChannelPointServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/his/service/impl/HisUserChannelPointServiceImpl.java
@@ -2,8 +2,8 @@ package com.qs.serve.modules.his.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.framework.base.util.CollectionUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bms.common.MasterUserType;
 import com.qs.serve.modules.bms.entity.*;
 import com.qs.serve.modules.bms.mapper.*;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java
index abc3cd0..80f0231 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java
@@ -4,14 +4,14 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.framework.redis.RedisService;
-import com.qs.serve.common.model.consts.RedisCacheKeys;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
+import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.framework.base.model.consts.RedisCacheKeys;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
 import com.qs.serve.modules.tag.util.TagFiledUtil;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.framework.base.util.CollectionUtil;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.bms.entity.BmsRegion;
 import com.qs.serve.modules.bms.entity.BmsRegion2;
 import com.qs.serve.modules.bms.entity.BmsRegionUser;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierTempServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierTempServiceImpl.java
index e1459e5..f19fd92 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierTempServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierTempServiceImpl.java
@@ -3,7 +3,7 @@ package com.qs.serve.modules.his.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.framework.redis.RedisService;
+import com.qs.serve.framework.base.framework.redis.RedisService;
 import com.qs.serve.modules.bms.entity.BmsRegion;
 import com.qs.serve.modules.bms.entity.BmsRegion2;
 import com.qs.serve.modules.bms.entity.BmsRegionUser;
@@ -12,7 +12,6 @@ import com.qs.serve.modules.bms.mapper.BmsRegion2Mapper;
 import com.qs.serve.modules.bms.mapper.BmsRegionMapper;
 import com.qs.serve.modules.bms.service.BmsRegionUserService;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
-import com.qs.serve.modules.his.entity.HisUserSupplier;
 import com.qs.serve.modules.his.mapper.HisUserSupplierMapper;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.sys.mapper.SysUserMapper;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/common/OmsSaleYearUtil.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/common/OmsSaleYearUtil.java
index 450c474..084fa9b 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/common/OmsSaleYearUtil.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/common/OmsSaleYearUtil.java
@@ -1,8 +1,8 @@
 package com.qs.serve.modules.oms.common;
 
-import com.qs.serve.common.framework.mybatis.handler.meta.TableNameAppendHandler;
-import com.qs.serve.common.util.ServletUtils;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.mbp.handler.SplitStringTypeHandler;
+import com.qs.serve.common.utils.StringUtils;
+import com.qs.serve.mbp.handler.TableNameAppendHandler;
 import lombok.experimental.UtilityClass;
 
 import java.time.LocalDate;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/OmsOrderController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/OmsOrderController.java
index edd1ff8..578cf11 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/OmsOrderController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/OmsOrderController.java
@@ -2,13 +2,14 @@ package com.qs.serve.modules.oms.controller;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.dto.SimpleKeyValue;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.model.dto.SimpleKeyValue;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.entity.BmsSupplierAddress;
 import com.qs.serve.modules.bms.mapper.BmsSupplierMapper;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/OmsOrderExpiredController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/OmsOrderExpiredController.java
index 848e49d..3261701 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/OmsOrderExpiredController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/OmsOrderExpiredController.java
@@ -1,10 +1,9 @@
 package com.qs.serve.modules.oms.controller;
 
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.modules.oms.entity.OmsOrder;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
 import com.qs.serve.modules.oms.service.OmsOrderOptionsService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/OmsOrderItemController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/OmsOrderItemController.java
index b68d223..6fb7222 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/OmsOrderItemController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/OmsOrderItemController.java
@@ -1,21 +1,17 @@
 package com.qs.serve.modules.oms.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import com.qs.serve.modules.oms.entity.OmsOrderItem;
 import com.qs.serve.modules.oms.service.OmsOrderItemService;
 
-import javax.validation.Valid;
 import java.util.List;
 
 /**
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/OmsSaleOrderController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/OmsSaleOrderController.java
index 2ae2a4a..b4d9bf5 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/OmsSaleOrderController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/OmsSaleOrderController.java
@@ -2,14 +2,14 @@ package com.qs.serve.modules.oms.controller;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.entity.BmsSupplierAddress;
 import com.qs.serve.modules.bms.mapper.BmsSupplierMapper;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/OmsSaleOrderItemController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/OmsSaleOrderItemController.java
index 52df870..deddd2d 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/OmsSaleOrderItemController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/OmsSaleOrderItemController.java
@@ -1,13 +1,11 @@
 package com.qs.serve.modules.oms.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.modules.oms.entity.OmsOrderItem;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
 import com.qs.serve.modules.oms.entity.OmsSaleOrderItem;
-import com.qs.serve.modules.oms.service.OmsOrderItemService;
 import com.qs.serve.modules.oms.service.OmsSaleOrderItemService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/api/OmsOrderApi.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/api/OmsOrderApi.java
index fff6da6..76064db 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/api/OmsOrderApi.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/api/OmsOrderApi.java
@@ -1,13 +1,16 @@
 package com.qs.serve.modules.oms.controller.api;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.dto.SimpleKeyValue;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.model.dto.SimpleKeyValue;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.entity.BmsSupplierAddress;
 import com.qs.serve.modules.bms.mapper.BmsSupplierMapper;
@@ -256,7 +259,7 @@ public class OmsOrderApi {
 
         for (OmsOrder order : list) {
 
-            if(order.getOrderType().equals(3)&&StringUtils.hasText(order.getOaRateId())){
+            if(order.getOrderType().equals(3)&& StringUtils.hasText(order.getOaRateId())){
                 for (SimpleKeyValue<String> rate : rates) {
                     if (rate.getValue().equals(order.getOaRateId())){
                         order.setDiscountRateInfo(rate);
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/api/OmsSaleOrderApi.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/api/OmsSaleOrderApi.java
index c63652c..963c631 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/api/OmsSaleOrderApi.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/api/OmsSaleOrderApi.java
@@ -2,13 +2,16 @@ package com.qs.serve.modules.oms.controller.api;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.dto.SimpleKeyValue;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.model.dto.SimpleKeyValue;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.entity.BmsSupplierAddress;
 import com.qs.serve.modules.bms.mapper.BmsSupplierMapper;
@@ -260,7 +263,7 @@ public class OmsSaleOrderApi {
 
         for (OmsSaleOrder order : list) {
 
-            if(order.getOrderType().equals(3)&&StringUtils.hasText(order.getOaRateId())){
+            if(order.getOrderType().equals(3)&& StringUtils.hasText(order.getOaRateId())){
                 for (SimpleKeyValue<String> rate : rates) {
                     if (rate.getValue().equals(order.getOaRateId())){
                         order.setDiscountRateInfo(rate);
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/api/OmsShoppingCartApi.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/api/OmsShoppingCartApi.java
index cb3f51c..c71f44c 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/api/OmsShoppingCartApi.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/api/OmsShoppingCartApi.java
@@ -1,9 +1,11 @@
 package com.qs.serve.modules.oms.controller.api;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.*;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.service.*;
 import com.qs.serve.modules.goods.entity.GoodsSku;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/mapper/ErpSaleOrderMapper.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/mapper/ErpSaleOrderMapper.java
index 98fbd0d..fe578e8 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/mapper/ErpSaleOrderMapper.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/mapper/ErpSaleOrderMapper.java
@@ -2,13 +2,8 @@ package com.qs.serve.modules.oms.mapper;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qs.serve.common.model.dto.SimpleKeyValue;
+import com.qs.serve.framework.base.model.dto.SimpleKeyValue;
 import com.qs.serve.modules.oms.entity.ErpSaleOrder;
-import com.qs.serve.modules.oms.entity.OmsSaleOrder;
-import org.apache.ibatis.annotations.Select;
-
-import java.math.BigDecimal;
-import java.util.List;
 
 /**
  * 订单 Mapper
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/mapper/OmsOrderMapper.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/mapper/OmsOrderMapper.java
index f166b31..3d83846 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/mapper/OmsOrderMapper.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/mapper/OmsOrderMapper.java
@@ -1,7 +1,7 @@
 package com.qs.serve.modules.oms.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qs.serve.common.model.dto.SimpleKeyValue;
+import com.qs.serve.framework.base.model.dto.SimpleKeyValue;
 import com.qs.serve.modules.oms.entity.OmsOrder;
 import org.apache.ibatis.annotations.Select;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/mapper/OmsSaleOrderMapper.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/mapper/OmsSaleOrderMapper.java
index 7779913..d23f8a5 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/mapper/OmsSaleOrderMapper.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/mapper/OmsSaleOrderMapper.java
@@ -1,8 +1,7 @@
 package com.qs.serve.modules.oms.mapper;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qs.serve.common.model.dto.SimpleKeyValue;
+import com.qs.serve.framework.base.model.dto.SimpleKeyValue;
 import com.qs.serve.modules.oms.entity.OmsSaleOrder;
 import org.apache.ibatis.annotations.Select;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/OmsOrderPart1Service.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/OmsOrderPart1Service.java
index 1472b13..5420a49 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/OmsOrderPart1Service.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/OmsOrderPart1Service.java
@@ -1,6 +1,6 @@
 package com.qs.serve.modules.oms.service;
 
-import com.qs.serve.common.model.dto.SimpleKeyValue;
+import com.qs.serve.framework.base.model.dto.SimpleKeyValue;
 import com.qs.serve.modules.oms.entity.OmsOrder;
 import com.qs.serve.modules.oms.entity.bo.OmsVerifySkuParam;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/OmsOrderService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/OmsOrderService.java
index b970c62..790219a 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/OmsOrderService.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/OmsOrderService.java
@@ -1,7 +1,7 @@
 package com.qs.serve.modules.oms.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qs.serve.common.model.dto.SimpleKeyValue;
+import com.qs.serve.framework.base.model.dto.SimpleKeyValue;
 import com.qs.serve.modules.bms.entity.BmsRegion;
 import com.qs.serve.modules.bms.entity.BmsSupplierAddress;
 import com.qs.serve.modules.goods.entity.GoodsCategoryRule;
@@ -10,7 +10,6 @@ import com.qs.serve.modules.oms.entity.OmsOrderItem;
 import com.qs.serve.modules.oms.entity.bo.*;
 import com.qs.serve.modules.oms.entity.vo.OmsConfirmOrderResult;
 import com.qs.serve.modules.oms.entity.vo.OmsSpuAssesInfo;
-import com.qs.serve.modules.sys.entity.SysUser;
 
 import java.math.BigDecimal;
 import java.util.List;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/OmsSaleOrderPart1Service.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/OmsSaleOrderPart1Service.java
index a6604a4..7208542 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/OmsSaleOrderPart1Service.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/OmsSaleOrderPart1Service.java
@@ -1,6 +1,6 @@
 package com.qs.serve.modules.oms.service;
 
-import com.qs.serve.common.model.dto.SimpleKeyValue;
+import com.qs.serve.framework.base.model.dto.SimpleKeyValue;
 import com.qs.serve.modules.oms.entity.OmsSaleOrder;
 import com.qs.serve.modules.oms.entity.bo.OmsVerifySkuParam;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/OmsSaleOrderService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/OmsSaleOrderService.java
index ee05ff5..9cc0e59 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/OmsSaleOrderService.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/OmsSaleOrderService.java
@@ -1,12 +1,10 @@
 package com.qs.serve.modules.oms.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qs.serve.common.model.dto.SimpleKeyValue;
+import com.qs.serve.framework.base.model.dto.SimpleKeyValue;
 import com.qs.serve.modules.bms.entity.BmsRegion;
 import com.qs.serve.modules.bms.entity.BmsSupplierAddress;
 import com.qs.serve.modules.goods.entity.GoodsCategoryRule;
-import com.qs.serve.modules.oms.entity.OmsOrder;
-import com.qs.serve.modules.oms.entity.OmsOrderItem;
 import com.qs.serve.modules.oms.entity.OmsSaleOrder;
 import com.qs.serve.modules.oms.entity.OmsSaleOrderItem;
 import com.qs.serve.modules.oms.entity.bo.*;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderOptionsServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderOptionsServiceImpl.java
index 0dcec12..264a14e 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderOptionsServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderOptionsServiceImpl.java
@@ -3,10 +3,12 @@ package com.qs.serve.modules.oms.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.oa.OaFormMainProcess;
-import com.qs.serve.common.util.*;
-import com.qs.serve.common.util.model.DateFormatString;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.model.oa.OaFormMainProcess;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.framework.base.util.model.DateFormatString;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bms.entity.BmsRegion;
 import com.qs.serve.modules.bms.entity.BmsRegion2;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderPart1ServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderPart1ServiceImpl.java
index 41bd9df..5b1cdfe 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderPart1ServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderPart1ServiceImpl.java
@@ -1,12 +1,12 @@
 package com.qs.serve.modules.oms.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.framework.redis.RedisService;
-import com.qs.serve.common.model.dto.SimpleKeyValue;
-import com.qs.serve.common.util.Assert;
+import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.framework.base.model.dto.SimpleKeyValue;
+import com.qs.serve.common.exception.Assert;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.CodeGenUtil;
-import com.qs.serve.common.util.CollectionUtil;
+import com.qs.serve.framework.base.util.CodeGenUtil;
+import com.qs.serve.framework.base.util.CollectionUtil;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.mapper.BmsRegionMapper;
 import com.qs.serve.modules.bms.mapper.BmsSupplierMapper;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java
index aaeb876..967d9d8 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java
@@ -3,10 +3,12 @@ package com.qs.serve.modules.oms.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.framework.redis.RedisService;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.dto.SimpleKeyValue;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.model.dto.SimpleKeyValue;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bms.entity.BmsRegion;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.entity.BmsSupplierAddress;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderOptionsServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderOptionsServiceImpl.java
index 3fe1e0f..e4dff87 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderOptionsServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderOptionsServiceImpl.java
@@ -3,13 +3,13 @@ package com.qs.serve.modules.oms.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.oa.OaFormMainProcess;
-import com.qs.serve.common.util.Assert;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.model.oa.OaFormMainProcess;
+import com.qs.serve.common.exception.Assert;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.DateUtils;
-import com.qs.serve.common.util.StringUtils;
-import com.qs.serve.common.util.model.DateFormatString;
+import com.qs.serve.framework.base.util.DateUtils;
+import com.qs.serve.common.utils.StringUtils;
+import com.qs.serve.framework.base.util.model.DateFormatString;
 import com.qs.serve.modules.bms.entity.BmsRegion;
 import com.qs.serve.modules.bms.entity.BmsRegion2;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderPart1ServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderPart1ServiceImpl.java
index 923a22c..7f4f8a9 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderPart1ServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderPart1ServiceImpl.java
@@ -1,12 +1,12 @@
 package com.qs.serve.modules.oms.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.framework.redis.RedisService;
-import com.qs.serve.common.model.dto.SimpleKeyValue;
-import com.qs.serve.common.util.Assert;
+import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.framework.base.model.dto.SimpleKeyValue;
+import com.qs.serve.common.exception.Assert;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.CodeGenUtil;
-import com.qs.serve.common.util.CollectionUtil;
+import com.qs.serve.framework.base.util.CodeGenUtil;
+import com.qs.serve.framework.base.util.CollectionUtil;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.mapper.BmsRegionMapper;
 import com.qs.serve.modules.bms.mapper.BmsSupplierMapper;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java
index 02ddefd..c9f23dd 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java
@@ -6,10 +6,12 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.util.StringUtil;
-import com.qs.serve.common.framework.redis.RedisService;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.dto.SimpleKeyValue;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.model.dto.SimpleKeyValue;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bms.entity.BmsRegion;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.entity.BmsSupplierAddress;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsShoppingCartServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsShoppingCartServiceImpl.java
index c4b417c..7ce7901 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsShoppingCartServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsShoppingCartServiceImpl.java
@@ -2,9 +2,9 @@ package com.qs.serve.modules.oms.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.util.Assert;
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.common.util.CopierUtil;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.util.CollectionUtil;
+import com.qs.serve.common.utils.CopierUtil;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.service.BmsRuleMainService;
 import com.qs.serve.modules.goods.entity.GoodsSku;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/utils/OmsOrderUtil.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/utils/OmsOrderUtil.java
index 84c97e3..52cf82e 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/utils/OmsOrderUtil.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/utils/OmsOrderUtil.java
@@ -1,6 +1,6 @@
 package com.qs.serve.modules.oms.utils;
 
-import com.qs.serve.common.util.Assert;
+import com.qs.serve.common.exception.Assert;
 import com.qs.serve.modules.oms.entity.OmsOrderItem;
 import com.qs.serve.modules.oms.entity.OmsSaleOrderItem;
 import lombok.experimental.UtilityClass;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oss/service/impl/OssServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oss/service/impl/OssServiceImpl.java
index 87f32ce..fba0312 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oss/service/impl/OssServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oss/service/impl/OssServiceImpl.java
@@ -5,7 +5,7 @@ import com.aliyun.oss.OSSClientBuilder;
 import com.aliyun.oss.common.utils.BinaryUtil;
 import com.aliyun.oss.model.MatchMode;
 import com.aliyun.oss.model.PolicyConditions;
-import com.qs.serve.common.config.properties.AliYunOssProperties;
+import com.qs.serve.framework.base.config.properties.AliYunOssProperties;
 import com.qs.serve.modules.oss.entity.OssPolicySignVo;
 import com.qs.serve.modules.oss.service.OssService;
 import lombok.AllArgsConstructor;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/other/controller/ZbiReportController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/other/controller/ZbiReportController.java
index 6e2f9e6..c106d61 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/other/controller/ZbiReportController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/other/controller/ZbiReportController.java
@@ -1,24 +1,13 @@
 package com.qs.serve.modules.other.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.framework.base.model.R;
 import com.qs.serve.modules.other.mapper.ZbiUserReportMapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import com.qs.serve.modules.other.entity.ZbiReport;
-import com.qs.serve.modules.other.service.ZbiReportService;
 
-import javax.validation.Valid;
 import java.util.List;
 
 /**
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/pay/controller/PayPaymentController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/pay/controller/PayPaymentController.java
index d830346..558054f 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/pay/controller/PayPaymentController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/pay/controller/PayPaymentController.java
@@ -1,36 +1,31 @@
 package com.qs.serve.modules.pay.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.github.pagehelper.PageHelper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.consts.SysConfigKey;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.model.consts.SysConfigKey;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.entity.so.BmsSupplierSo;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
 import com.qs.serve.modules.excel.common.DataSupplierSo;
 import com.qs.serve.modules.excel.entity.DataCheckApplyMainInfo;
 import com.qs.serve.modules.excel.service.DateCheckApplyService;
-import com.qs.serve.modules.his.service.HisUserSupplierService;
-import com.qs.serve.modules.pay.common.PaymentType;
 import com.qs.serve.modules.pay.entity.PayPaymentItem;
-import com.qs.serve.modules.pay.entity.bo.PayUnPaymentBo;
 import com.qs.serve.modules.pay.entity.dto.PayPaymentAmountDto;
-import com.qs.serve.modules.pay.entity.dto.PaySupplierAmountDto;
 import com.qs.serve.modules.pay.entity.vo.PaySupplierVo;
 import com.qs.serve.modules.pay.mapper.PaySupplierMapper;
 import com.qs.serve.modules.pay.service.PayPaymentItemService;
 import com.qs.serve.modules.sys.entity.SysConfig;
 import com.qs.serve.modules.sys.entity.SysSyncLog;
 import com.qs.serve.modules.sys.service.SysConfigService;
-import com.qs.serve.modules.sys.service.SysPostUserService;
 import com.qs.serve.modules.sys.service.SysSyncLogService;
-import com.qs.serve.modules.tbs.mapper.TbsCostApplySumAmountMapper;
-import com.qs.serve.modules.third.ThirdTokenUtil;
 import com.qs.serve.modules.third.entity.ProcessCreateCostApplyBo;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -45,11 +40,9 @@ import com.qs.serve.modules.pay.service.PayPaymentService;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
-import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 支付 支付记录
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/pay/controller/PayWayController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/pay/controller/PayWayController.java
index bb458ba..1a4b0bc 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/pay/controller/PayWayController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/pay/controller/PayWayController.java
@@ -1,14 +1,13 @@
 package com.qs.serve.modules.pay.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/pay/controller/my/PayPaymentMyController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/pay/controller/my/PayPaymentMyController.java
index 321575b..a4d5a93 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/pay/controller/my/PayPaymentMyController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/pay/controller/my/PayPaymentMyController.java
@@ -1,8 +1,9 @@
 package com.qs.serve.modules.pay.controller.my;
 
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.*;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.CopierUtil;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.entity.so.BmsSupplierSo;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/pay/mapper/PayPaymentItemMapper.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/pay/mapper/PayPaymentItemMapper.java
index 85fc6ee..1ab5365 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/pay/mapper/PayPaymentItemMapper.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/pay/mapper/PayPaymentItemMapper.java
@@ -1,7 +1,7 @@
 package com.qs.serve.modules.pay.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qs.serve.common.model.AmountDTO;
+import com.qs.serve.framework.base.model.AmountDTO;
 import com.qs.serve.modules.pay.entity.PayPaymentItem;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/pay/service/impl/PayApplicationService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/pay/service/impl/PayApplicationService.java
index 72db31a..e4624b8 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/pay/service/impl/PayApplicationService.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/pay/service/impl/PayApplicationService.java
@@ -1,8 +1,8 @@
 package com.qs.serve.modules.pay.service.impl;
 
-import com.qs.serve.common.model.AmountDTO;
+import com.qs.serve.framework.base.model.AmountDTO;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.CollectionUtil;
+import com.qs.serve.framework.base.util.CollectionUtil;
 import com.qs.serve.modules.pay.mapper.PayPaymentItemMapper;
 import com.qs.serve.modules.tbs.entity.TbsActivity;
 import com.qs.serve.modules.tbs.entity.TbsActivityCenter;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/pay/service/impl/PayPaymentServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/pay/service/impl/PayPaymentServiceImpl.java
index 344f10c..28d2d3b 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/pay/service/impl/PayPaymentServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/pay/service/impl/PayPaymentServiceImpl.java
@@ -2,8 +2,8 @@ package com.qs.serve.modules.pay.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.util.Assert;
-import com.qs.serve.common.util.CopierUtil;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.common.utils.CopierUtil;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
 import com.qs.serve.modules.pay.common.PaymentType;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/controller/QmsCategoryController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/controller/QmsCategoryController.java
index fe12163..7dcef72 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/controller/QmsCategoryController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/controller/QmsCategoryController.java
@@ -1,12 +1,12 @@
 package com.qs.serve.modules.qms.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/controller/QmsFormController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/controller/QmsFormController.java
index d1336df..851b3fa 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/controller/QmsFormController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/controller/QmsFormController.java
@@ -1,13 +1,13 @@
 package com.qs.serve.modules.qms.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.qms.entity.QmsFormSubmit;
 import com.qs.serve.modules.qms.entity.bo.QmsFormBo;
 import com.qs.serve.modules.qms.service.QmsFormSubmitService;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/controller/QmsFormSubmitController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/controller/QmsFormSubmitController.java
index bae6042..a958926 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/controller/QmsFormSubmitController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/controller/QmsFormSubmitController.java
@@ -1,14 +1,12 @@
 package com.qs.serve.modules.qms.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.modules.qms.entity.QmsDraft;
-import com.qs.serve.modules.qms.service.QmsGroupService;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/controller/QmsGroupController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/controller/QmsGroupController.java
index a97b500..f4a8cd1 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/controller/QmsGroupController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/controller/QmsGroupController.java
@@ -1,14 +1,16 @@
 package com.qs.serve.modules.qms.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.LimitSubmit;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.dto.SimpleKeyValue;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.annotation.LimitSubmit;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.qms.entity.QmsForm;
 import com.qs.serve.modules.qms.entity.QmsGroupScope;
 import com.qs.serve.modules.qms.entity.bo.QmsGroupBo;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/controller/api/QmsDraftApiController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/controller/api/QmsDraftApiController.java
index c460f54..2f297cc 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/controller/api/QmsDraftApiController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/controller/api/QmsDraftApiController.java
@@ -1,8 +1,8 @@
 package com.qs.serve.modules.qms.controller.api;
 
-import com.qs.serve.common.model.dto.R;
+import com.qs.serve.framework.base.model.R;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.CopierUtil;
+import com.qs.serve.common.utils.CopierUtil;
 import com.qs.serve.modules.qms.entity.bo.QmsDraftBo;
 import com.qs.serve.modules.qms.entity.vo.QmsDraftVo;
 import lombok.AllArgsConstructor;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/controller/api/QmsSubmitApiController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/controller/api/QmsSubmitApiController.java
index e66183b..9c021f5 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/controller/api/QmsSubmitApiController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/controller/api/QmsSubmitApiController.java
@@ -1,14 +1,14 @@
 package com.qs.serve.modules.qms.controller.api;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.InterType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.InterType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.qms.entity.QmsFormSubmit;
 import com.qs.serve.modules.qms.entity.QmsGroup;
 import com.qs.serve.modules.qms.entity.QmsGroupScope;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/controller/my/QmsDraftMyController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/controller/my/QmsDraftMyController.java
index 0f3689d..8bedab3 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/controller/my/QmsDraftMyController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/controller/my/QmsDraftMyController.java
@@ -1,8 +1,8 @@
 package com.qs.serve.modules.qms.controller.my;
 
-import com.qs.serve.common.model.dto.R;
+import com.qs.serve.framework.base.model.R;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.CopierUtil;
+import com.qs.serve.common.utils.CopierUtil;
 import com.qs.serve.modules.qms.entity.QmsDraft;
 import com.qs.serve.modules.qms.entity.bo.QmsDraftBo;
 import com.qs.serve.modules.qms.entity.vo.QmsDraftVo;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/controller/my/QmsSubmitMyController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/controller/my/QmsSubmitMyController.java
index 20e6508..f034637 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/controller/my/QmsSubmitMyController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/controller/my/QmsSubmitMyController.java
@@ -1,15 +1,15 @@
 package com.qs.serve.modules.qms.controller.my;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.InterType;
-import com.qs.serve.common.model.enums.SystemModule;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.InterType;
+import com.qs.serve.common.enums.SystemModule;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.qms.entity.QmsFormSubmit;
 import com.qs.serve.modules.qms.entity.QmsGroup;
 import com.qs.serve.modules.qms.entity.QmsGroupScope;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/entity/QmsGroup.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/entity/QmsGroup.java
index fb8a5c0..b26e863 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/entity/QmsGroup.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/entity/QmsGroup.java
@@ -7,13 +7,9 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
-import com.qs.serve.common.model.dto.SimpleKeyValue;
 import com.qs.serve.modules.sys.entity.SysDept;
 import com.qs.serve.modules.sys.entity.dto.SysUserSimpleVo;
 import lombok.Data;
-import org.apache.ibatis.annotations.Options;
-import org.apache.ibatis.type.JdbcType;
 import org.hibernate.validator.constraints.Length;
 import org.springframework.format.annotation.DateTimeFormat;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/service/impl/QmsFormSubmitServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/service/impl/QmsFormSubmitServiceImpl.java
index 14f4e07..578542c 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/service/impl/QmsFormSubmitServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/service/impl/QmsFormSubmitServiceImpl.java
@@ -2,7 +2,7 @@ package com.qs.serve.modules.qms.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.util.Assert;
+import com.qs.serve.common.exception.Assert;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
 import com.qs.serve.modules.qms.entity.QmsForm;
 import com.qs.serve.modules.qms.entity.QmsGroup;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/service/impl/QmsGroupScopeServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/service/impl/QmsGroupScopeServiceImpl.java
index 94a99f7..434c728 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/service/impl/QmsGroupScopeServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/qms/service/impl/QmsGroupScopeServiceImpl.java
@@ -2,9 +2,8 @@ package com.qs.serve.modules.qms.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.util.Assert;
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.common.util.IdUtil;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.util.CollectionUtil;
 import com.qs.serve.modules.qms.entity.QmsGroup;
 import com.qs.serve.modules.qms.entity.bo.QmsGroupBo;
 import com.qs.serve.modules.qms.service.QmsGroupService;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sale/controller/SalePlanController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sale/controller/SalePlanController.java
index 361c4a4..99e314f 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sale/controller/SalePlanController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sale/controller/SalePlanController.java
@@ -1,20 +1,18 @@
 package com.qs.serve.modules.sale.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.sale.entity.SalePlanGoods;
 import com.qs.serve.modules.sale.entity.bo.SalePlanBo;
 import com.qs.serve.modules.sale.service.SalePlanGoodsService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import com.qs.serve.modules.sale.entity.SalePlan;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sale/controller/my/SalePlanMyController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sale/controller/my/SalePlanMyController.java
index a145b7b..cf28bb0 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sale/controller/my/SalePlanMyController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sale/controller/my/SalePlanMyController.java
@@ -1,10 +1,10 @@
 package com.qs.serve.modules.sale.controller.my;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.sale.entity.SalePlan;
 import com.qs.serve.modules.sale.service.SalePlanGoodsService;
 import com.qs.serve.modules.sale.service.SalePlanService;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sale/service/impl/SalePlanServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sale/service/impl/SalePlanServiceImpl.java
index ab64e39..831ad76 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sale/service/impl/SalePlanServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sale/service/impl/SalePlanServiceImpl.java
@@ -2,7 +2,7 @@ package com.qs.serve.modules.sale.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.CodeGenUtil;
+import com.qs.serve.framework.base.util.CodeGenUtil;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.mapper.BmsSupplierMapper;
 import com.qs.serve.modules.goods.entity.GoodsCategory;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/SeeYonController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/SeeYonController.java
index 32d95d0..53fb585 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/SeeYonController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/SeeYonController.java
@@ -1,9 +1,11 @@
 package com.qs.serve.modules.seeyon;
 
-import com.qs.serve.common.config.properties.ProjectProperties;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.*;
+import com.qs.serve.framework.base.config.properties.ProjectProperties;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.ServletUtils;
 import com.qs.serve.modules.seeyon.entity.CtpAffair;
 import com.qs.serve.modules.seeyon.entity.bo.CheckTargetDTO;
 import com.qs.serve.modules.seeyon.entity.bo.SeeYonApproveQuery;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/entity/bo/SeeYonApproveQuery.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/entity/bo/SeeYonApproveQuery.java
index 1af4e70..46fea26 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/entity/bo/SeeYonApproveQuery.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/entity/bo/SeeYonApproveQuery.java
@@ -1,12 +1,7 @@
 package com.qs.serve.modules.seeyon.entity.bo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.qs.serve.common.util.model.QsJsonLocalDateTimeDeserializer;
+import com.qs.serve.framework.base.util.model.QsJsonLocalDateTimeDeserializer;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalDate;
 
 /**
  * @author YenHex
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/entity/vo/SeeYonApproveDataVo.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/entity/vo/SeeYonApproveDataVo.java
index 7e5407b..98de365 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/entity/vo/SeeYonApproveDataVo.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/entity/vo/SeeYonApproveDataVo.java
@@ -1,9 +1,8 @@
 package com.qs.serve.modules.seeyon.entity.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.qs.serve.common.util.model.QsJsonLocalDateTimeDeserializer;
+import com.qs.serve.framework.base.util.model.QsJsonLocalDateTimeDeserializer;
 import lombok.Data;
 
 import java.time.LocalDateTime;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/CommonCheckService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/CommonCheckService.java
index e94c9a0..4c22e67 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/CommonCheckService.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/CommonCheckService.java
@@ -1,6 +1,6 @@
 package com.qs.serve.modules.seeyon.service;
 
-import com.qs.serve.common.model.dto.PageVo;
+import com.qs.serve.framework.base.model.PageVo;
 import com.qs.serve.modules.seeyon.entity.dto.TodoVoQuery;
 import com.qs.serve.modules.seeyon.entity.vo.TodoVO;
 import java.util.List;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonBaseService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonBaseService.java
index 084772b..bbf0c6e 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonBaseService.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonBaseService.java
@@ -1,6 +1,6 @@
 package com.qs.serve.modules.seeyon.service;
 
-import com.qs.serve.common.util.SpringUtils;
+import com.qs.serve.framework.base.util.SpringUtils;
 import com.qs.serve.modules.sys.mapper.SysUserMapper;
 
 /**
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java
index 157a7b5..bba9b32 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java
@@ -1,8 +1,10 @@
 package com.qs.serve.modules.seeyon.service;
 
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.data.entity.DataAffairCommit;
 import com.qs.serve.modules.data.mapper.DataAffairCommitMapper;
 import com.qs.serve.modules.seeyon.entity.CtpAffair;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonRequestService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonRequestService.java
index c22b87a..32e7474 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonRequestService.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonRequestService.java
@@ -1,16 +1,11 @@
 package com.qs.serve.modules.seeyon.service;
 
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.oa.OaFormMainProcess;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.model.oa.OaFormMainProcess;
 import com.qs.serve.modules.seeyon.entity.*;
 import com.qs.serve.modules.seeyon.entity.bo.CtpAddNodeDTO;
-import com.qs.serve.modules.seeyon.enums.SyAffairState;
 import com.qs.serve.modules.tbs.entity.bo.TbsAffairCommitBo;
-import com.qs.serve.modules.tbs.entity.vo.CtpAffairVo;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/XiaoLuTonService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/XiaoLuTonService.java
index 40c1d4c..d8bd08b 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/XiaoLuTonService.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/XiaoLuTonService.java
@@ -1,10 +1,9 @@
 package com.qs.serve.modules.seeyon.service;
 
-import com.qs.serve.common.model.dto.R;
+import com.qs.serve.framework.base.model.R;
 import com.qs.serve.modules.seeyon.entity.XltApticlaim;
 import com.qs.serve.modules.seeyon.entity.XltPaymentRecord;
 import com.qs.serve.modules.tzc.entity.dto.PolicyItemDto;
-import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * @author YenHex
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/impl/CommonCheckServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/impl/CommonCheckServiceImpl.java
index be5d7ca..aabb9c8 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/impl/CommonCheckServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/impl/CommonCheckServiceImpl.java
@@ -2,9 +2,9 @@ package com.qs.serve.modules.seeyon.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.dto.PageVo;
+import com.qs.serve.framework.base.model.PageVo;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.seeyon.entity.dto.TodoVoQuery;
 import com.qs.serve.modules.seeyon.entity.vo.TodoVO;
 import com.qs.serve.modules.seeyon.enums.CheckTypeEnum;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonRequestBaseService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonRequestBaseService.java
index 64fde84..93b9135 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonRequestBaseService.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonRequestBaseService.java
@@ -1,11 +1,11 @@
 package com.qs.serve.modules.seeyon.service.impl;
 
 import cn.hutool.crypto.SecureUtil;
-import com.qs.serve.common.config.properties.SeeYonProperties;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.Assert;
-import com.qs.serve.common.util.HttpUtil;
-import com.qs.serve.common.util.JsonUtil;
+import com.qs.serve.framework.base.config.properties.SeeYonProperties;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.util.HttpUtil;
+import com.qs.serve.framework.base.util.JsonUtil;
 import com.qs.serve.modules.sys.service.SysUserService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonRequestServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonRequestServiceImpl.java
index f35be08..3f7d22c 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonRequestServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/impl/SeeYonRequestServiceImpl.java
@@ -1,10 +1,12 @@
 package com.qs.serve.modules.seeyon.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.oa.OaFormMainProcess;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.model.oa.OaFormMainProcess;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.seeyon.entity.*;
 import com.qs.serve.modules.seeyon.entity.bo.CtpAddNodeDTO;
 import com.qs.serve.modules.seeyon.enums.SyAffairState;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/impl/XiaoLuTonServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/impl/XiaoLuTonServiceImpl.java
index 3cd1a56..7dddc77 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/impl/XiaoLuTonServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/seeyon/service/impl/XiaoLuTonServiceImpl.java
@@ -1,6 +1,6 @@
 package com.qs.serve.modules.seeyon.service.impl;
 
-import com.qs.serve.common.model.dto.R;
+import com.qs.serve.framework.base.model.R;
 import com.qs.serve.modules.seeyon.entity.XltApticlaim;
 import com.qs.serve.modules.seeyon.entity.XltPaymentRecord;
 import com.qs.serve.modules.seeyon.service.XiaoLuTonService;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sync/AsyncFactory.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sync/AsyncFactory.java
index c030f59..fe72aad 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sync/AsyncFactory.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sync/AsyncFactory.java
@@ -1,10 +1,10 @@
 package com.qs.serve.modules.sync;
 
 
-import com.qs.serve.common.framework.redis.RedisService;
-import com.qs.serve.common.model.dto.R;
+import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.framework.base.model.R;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.SpringUtils;
+import com.qs.serve.framework.base.util.SpringUtils;
 import com.qs.serve.modules.seeyon.service.impl.SeeYonRequestBaseService;
 import com.qs.serve.modules.sys.entity.SysOperationLog;
 import com.qs.serve.modules.sys.mapper.SysOperationLogMapper;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/common/AuthContextUtils.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/common/AuthContextUtils.java
index c3faf26..a77297f 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/common/AuthContextUtils.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/common/AuthContextUtils.java
@@ -1,13 +1,14 @@
 package com.qs.serve.modules.sys.common;
 
-import com.qs.serve.common.framework.security.model.LoginUser;
-import com.qs.serve.common.framework.security.model.LoginUserType;
-import com.qs.serve.common.model.consts.GySysConst;
-import com.qs.serve.common.model.enums.HttpCode;
-import com.qs.serve.common.util.Assert;
-import com.qs.serve.common.util.ServletUtils;
-import com.qs.serve.common.util.SpringUtils;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.framework.base.framework.security.model.LoginUser;
+import com.qs.serve.framework.base.framework.security.model.LoginUserType;
+import com.qs.serve.framework.base.model.consts.GySysConst;
+import com.qs.serve.common.enums.HttpCode;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.common.utils.ServletUtils;
+import com.qs.serve.framework.base.util.SpringUtils;
+import com.qs.serve.common.utils.StringUtils;
+import com.qs.serve.mbp.context.SecurityUserUtil;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
 import lombok.experimental.UtilityClass;
@@ -26,11 +27,10 @@ import java.util.Objects;
 @UtilityClass
 public class AuthContextUtils {
 
-    private final static ThreadLocal<String> THREAD_TENANT = new ThreadLocal<>();
     private final static ThreadLocal<Long> THREAD_SUPPLIER = new ThreadLocal<>();
 
     public static void removeThreadLocal(){
-        THREAD_TENANT.remove();
+        SecurityUserUtil.removeThreadLocal();
         THREAD_SUPPLIER.remove();
     }
 
@@ -94,9 +94,10 @@ public class AuthContextUtils {
                 .getTypeFlag().equals(LoginUserType.SYS_SUP_USER);
     }
 
-    public static void setTenant(String value){THREAD_TENANT.set(value);}
+    public static void setTenant(String value){
+        SecurityUserUtil.setTenant(value);}
 
-    public static String getTenant(){return THREAD_TENANT.get();}
+    public static String getTenant(){return SecurityUserUtil.getTenant();}
 
 
 
@@ -139,12 +140,12 @@ public class AuthContextUtils {
 
     public static Long getSupplierId(){return THREAD_SUPPLIER.get();}
 
-    public static void removeTenant(){THREAD_TENANT.remove();}
-
     public static LoginUser getLoginUser(boolean throwEx){
         UserDetails details = getUserDetail(throwEx);
         if(details instanceof LoginUser){
-            return (LoginUser) details;
+            LoginUser loginUser =  (LoginUser) details;
+            SecurityUserUtil.setUserId(loginUser.getUserId());
+            return loginUser;
         }
         return null;
     }
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysAttachController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysAttachController.java
index 261c4cf..6956e49 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysAttachController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysAttachController.java
@@ -2,14 +2,14 @@ package com.qs.serve.modules.sys.controller;
 
 import cn.hutool.core.io.FileUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.qs.serve.common.config.properties.UploadProperties;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.util.Assert;
-import com.qs.serve.common.util.IdUtil;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.framework.base.config.properties.UploadProperties;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.util.IdUtil;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.sys.entity.SysAttach;
 import com.qs.serve.modules.sys.service.SysAttachService;
 import lombok.AllArgsConstructor;
@@ -21,7 +21,6 @@ import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.util.WebUtils;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
 import java.io.File;
 import java.io.IOException;
 import java.time.LocalDate;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysBusinessLogController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysBusinessLogController.java
index f2b6c9a..9cb29ea 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysBusinessLogController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysBusinessLogController.java
@@ -1,14 +1,10 @@
 package com.qs.serve.modules.sys.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysConfigController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysConfigController.java
index 66955d4..ecd5c78 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysConfigController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysConfigController.java
@@ -1,13 +1,10 @@
 package com.qs.serve.modules.sys.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -18,7 +15,6 @@ import com.qs.serve.modules.sys.entity.SysConfig;
 import com.qs.serve.modules.sys.service.SysConfigService;
 
 import javax.validation.Valid;
-import java.util.List;
 
 /**
  * 系统 系统配置
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysDeptController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysDeptController.java
index 7cf4b8c..31da271 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysDeptController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysDeptController.java
@@ -2,13 +2,13 @@ package com.qs.serve.modules.sys.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.TreeUtil;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.TreeUtil;
 import com.qs.serve.modules.sys.entity.SysDept;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.sys.entity.bo.SysDeptBatchBo;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysDictController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysDictController.java
index 2ec559b..cd2b6ee 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysDictController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysDictController.java
@@ -1,12 +1,12 @@
 package com.qs.serve.modules.sys.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysDictDataController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysDictDataController.java
index b4846ed..0532e38 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysDictDataController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysDictDataController.java
@@ -1,13 +1,13 @@
 package com.qs.serve.modules.sys.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysMenuController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysMenuController.java
index 7c77052..3250a98 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysMenuController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysMenuController.java
@@ -2,12 +2,15 @@ package com.qs.serve.modules.sys.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.qs.serve.common.framework.security.model.LoginUser;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.util.*;
+import com.qs.serve.framework.base.framework.security.model.LoginUser;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.TreeUtil;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
 import com.qs.serve.modules.sys.entity.SysMenu;
 import com.qs.serve.modules.sys.entity.SysMenuPermit;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysNoticeController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysNoticeController.java
index bc17a28..fc445a9 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysNoticeController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysNoticeController.java
@@ -1,13 +1,13 @@
 package com.qs.serve.modules.sys.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.framework.base.util.CollectionUtil;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.sys.entity.*;
 import com.qs.serve.modules.sys.entity.dto.SysUserVo;
 import com.qs.serve.modules.sys.service.*;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysNoticeTypeController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysNoticeTypeController.java
index eaf9c77..740e27c 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysNoticeTypeController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysNoticeTypeController.java
@@ -1,11 +1,11 @@
 package com.qs.serve.modules.sys.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.sys.entity.SysNoticeType;
 import com.qs.serve.modules.sys.service.SysNoticeTypeService;
 import lombok.AllArgsConstructor;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysNoticeUserController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysNoticeUserController.java
index 574ffef..5d2b8cf 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysNoticeUserController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysNoticeUserController.java
@@ -2,11 +2,11 @@ package com.qs.serve.modules.sys.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.framework.base.util.CollectionUtil;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.sys.entity.SysAttach;
 import com.qs.serve.modules.sys.entity.SysNotice;
 import com.qs.serve.modules.sys.entity.SysNoticeUser;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysOperationLogController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysOperationLogController.java
index c83223d..fdc90f6 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysOperationLogController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysOperationLogController.java
@@ -1,12 +1,12 @@
 package com.qs.serve.modules.sys.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.qs.serve.common.framework.security.model.LoginUser;
-import com.qs.serve.common.model.consts.GySysConst;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
+import com.qs.serve.framework.base.framework.security.model.LoginUser;
+import com.qs.serve.framework.base.model.consts.GySysConst;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.sys.entity.SysOperationLog;
 import com.qs.serve.modules.sys.service.SysOperationLogService;
 import lombok.AllArgsConstructor;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysOperationManualController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysOperationManualController.java
index d139628..69b193c 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysOperationManualController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysOperationManualController.java
@@ -1,20 +1,16 @@
 package com.qs.serve.modules.sys.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.util.CollectionUtil;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.sys.entity.SysAttach;
 import com.qs.serve.modules.sys.service.SysAttachService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import com.qs.serve.modules.sys.entity.SysOperationManual;
@@ -25,7 +21,7 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * 系统 
+ * 系统
  * @author YenHex
  * @since 2023-08-11
  */
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysPermitController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysPermitController.java
index 793c18b..cb469e1 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysPermitController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysPermitController.java
@@ -2,13 +2,11 @@ package com.qs.serve.modules.sys.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.TreeUtil;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.TreeUtil;
 import com.qs.serve.modules.sys.entity.SysPermit;
 import com.qs.serve.modules.sys.entity.dto.SysPermitTreeNode;
 import com.qs.serve.modules.sys.service.SysPermitService;
@@ -17,7 +15,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
 import java.util.List;
 import java.util.stream.Collectors;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysPostController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysPostController.java
index a35f238..cd38104 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysPostController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysPostController.java
@@ -2,19 +2,17 @@ package com.qs.serve.modules.sys.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.TreeUtil;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.TreeUtil;
 import com.qs.serve.modules.sys.entity.SysPost;
 import com.qs.serve.modules.sys.entity.SysPostUser;
 import com.qs.serve.modules.sys.entity.vo.SysPostTreeVo;
-import com.qs.serve.modules.sys.service.SysDeptService;
 import com.qs.serve.modules.sys.service.SysPostService;
 import com.qs.serve.modules.sys.service.SysPostUserService;
-import com.qs.serve.modules.tag.entity.vo.TagCategoryTreeVo;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysPostUserController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysPostUserController.java
index 4247e13..eb8707a 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysPostUserController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysPostUserController.java
@@ -1,17 +1,16 @@
 package com.qs.serve.modules.sys.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.StringUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import com.qs.serve.modules.sys.entity.so.SysPostUserSo;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysRoleController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysRoleController.java
index 3e55ed5..d8c356b 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysRoleController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysRoleController.java
@@ -2,11 +2,11 @@ package com.qs.serve.modules.sys.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.sys.entity.SysRole;
 import com.qs.serve.modules.sys.entity.SysRoleMenu;
 import com.qs.serve.modules.sys.entity.SysUserRole;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysTenantController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysTenantController.java
index 2218438..fce94cf 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysTenantController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysTenantController.java
@@ -1,11 +1,11 @@
 package com.qs.serve.modules.sys.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.sys.entity.SysTenant;
 import com.qs.serve.modules.sys.service.SysTenantService;
 import lombok.AllArgsConstructor;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java
index 0bf2f74..a76a386 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java
@@ -5,13 +5,17 @@ import cn.hutool.crypto.SecureUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
-import com.qs.serve.common.framework.security.model.LoginUser;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.consts.GySysConst;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.framework.security.model.LoginUser;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.consts.GySysConst;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.StringUtils;
+import com.qs.serve.common.utils.TreeUtil;
 import com.qs.serve.modules.oms.entity.bo.SysFlowCancelBo;
 import com.qs.serve.modules.oms.entity.bo.SysFlowLeaveBo;
 import com.qs.serve.modules.oms.entity.bo.SysFlowUserBo;
@@ -355,7 +359,7 @@ public class SysUserController {
         param.setId("SU"+IdUtil.getSnowFlakeId());
         param.setServingState(1);
         boolean result = sysUserService.save(param);
-//        if(param.getId()!=null&& com.qs.serve.common.util.CollectionUtil.isNotEmpty(userBo.getRoleIds())){
+//        if(param.getId()!=null&& com.qs.serve.framework.base.util.CollectionUtil.isNotEmpty(userBo.getRoleIds())){
 //            sysRoleService.saveUserRole4Edit(userBo.getRoleIds(),param.getId());
 //        }
         return R.isTrue(result);
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/api/SysDictApi.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/api/SysDictApi.java
index 9ca6d8f..5076d8f 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/api/SysDictApi.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/controller/api/SysDictApi.java
@@ -1,16 +1,11 @@
 package com.qs.serve.modules.sys.controller.api;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.sys.controller.SysAttachController;
-import com.qs.serve.modules.sys.entity.SysDict;
 import com.qs.serve.modules.sys.entity.SysDictData;
 import com.qs.serve.modules.sys.service.SysDictDataService;
-import com.qs.serve.modules.sys.service.SysDictService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/entity/SysNotice.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/entity/SysNotice.java
index 4c7c51c..943025b 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/entity/SysNotice.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/entity/SysNotice.java
@@ -6,7 +6,8 @@ import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.qs.serve.common.framework.mybatis.handler.meta.JsonStringTypeHandler;
+import com.qs.serve.mbp.handler.JsonStringTypeHandler;
+import com.qs.serve.mbp.handler.SplitStringTypeHandler;
 import lombok.Data;
 import org.apache.ibatis.type.JdbcType;
 import org.hibernate.validator.constraints.Length;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/entity/SysOperationManual.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/entity/SysOperationManual.java
index 0eeef46..b2254f8 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/entity/SysOperationManual.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/entity/SysOperationManual.java
@@ -1,23 +1,15 @@
 package com.qs.serve.modules.sys.entity;
 
-import java.time.LocalDate;
 import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
 import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
+import com.qs.serve.mbp.handler.SplitStringTypeHandler;
 import lombok.Data;
 import org.apache.ibatis.type.JdbcType;
 import org.hibernate.validator.constraints.Length;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
 
 /**
  *  实体类
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/entity/SysUser.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/entity/SysUser.java
index 73b9e45..f9b407f 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/entity/SysUser.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/entity/SysUser.java
@@ -9,9 +9,9 @@ import cn.hutool.core.util.DesensitizedUtil;
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.qs.serve.common.util.Assert;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.sys.entity.dto.SysUserSimpleVo;
 import com.qs.serve.modules.sys.entity.dto.SysUserVo;
 import lombok.Data;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/entity/dto/SysDeptTreeNode.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/entity/dto/SysDeptTreeNode.java
index e523795..4b6ec22 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/entity/dto/SysDeptTreeNode.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/entity/dto/SysDeptTreeNode.java
@@ -3,7 +3,7 @@ package com.qs.serve.modules.sys.entity.dto;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.qs.serve.common.model.dto.TreeNode;
+import com.qs.serve.framework.base.model.TreeNode;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/entity/dto/SysMenuTreeNode.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/entity/dto/SysMenuTreeNode.java
index dab3c6e..74bcd05 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/entity/dto/SysMenuTreeNode.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/entity/dto/SysMenuTreeNode.java
@@ -2,7 +2,7 @@ package com.qs.serve.modules.sys.entity.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.qs.serve.common.model.dto.TreeNode;
+import com.qs.serve.framework.base.model.TreeNode;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/entity/dto/SysPermitTreeNode.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/entity/dto/SysPermitTreeNode.java
index ec68bfc..e987a35 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/entity/dto/SysPermitTreeNode.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/entity/dto/SysPermitTreeNode.java
@@ -2,7 +2,7 @@ package com.qs.serve.modules.sys.entity.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.qs.serve.common.model.dto.TreeNode;
+import com.qs.serve.framework.base.model.TreeNode;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/entity/dto/SysUserSalesTreeVo.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/entity/dto/SysUserSalesTreeVo.java
index 94dca4a..319bdf8 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/entity/dto/SysUserSalesTreeVo.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/entity/dto/SysUserSalesTreeVo.java
@@ -1,17 +1,12 @@
 package com.qs.serve.modules.sys.entity.dto;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.qs.serve.common.model.dto.TreeNode;
+import com.qs.serve.framework.base.model.TreeNode;
 import lombok.Data;
-import org.hibernate.validator.constraints.Length;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 
 /**
  * @author YenHex
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/entity/vo/SysPostTreeVo.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/entity/vo/SysPostTreeVo.java
index 9712ff9..f61c36e 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/entity/vo/SysPostTreeVo.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/entity/vo/SysPostTreeVo.java
@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.SqlCondition;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.qs.serve.common.model.dto.TreeNode;
+import com.qs.serve.framework.base.model.TreeNode;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/SysUserService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/SysUserService.java
index f928570..76778d2 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/SysUserService.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/SysUserService.java
@@ -1,12 +1,11 @@
 package com.qs.serve.modules.sys.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qs.serve.common.framework.security.model.LoginUser;
+import com.qs.serve.framework.base.framework.security.model.LoginUser;
 import com.qs.serve.modules.sys.entity.SysPostUser;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.sys.entity.bo.SysUserLeaveBo;
 
-import java.time.LocalDate;
 import java.util.List;
 
 /**
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysBusinessLogServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysBusinessLogServiceImpl.java
index 7f317ff..f7ebda6 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysBusinessLogServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysBusinessLogServiceImpl.java
@@ -1,10 +1,10 @@
 package com.qs.serve.modules.sys.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.model.dto.DiffFieldVal;
+import com.qs.serve.framework.base.model.dto.DiffFieldVal;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.BusinessDifferenceUtil;
-import com.qs.serve.common.util.JsonUtil;
+import com.qs.serve.framework.base.util.BusinessDifferenceUtil;
+import com.qs.serve.framework.base.util.JsonUtil;
 import com.qs.serve.modules.sys.common.enums.BusinessLogOption;
 import com.qs.serve.modules.sys.common.enums.BusinessLogType;
 import com.qs.serve.modules.sys.entity.SysUser;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java
index 77b4608..fb42c28 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java
@@ -2,8 +2,10 @@ package com.qs.serve.modules.sys.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bir.consts.BirActivityCenterGoodsUtil;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.mapper.BmsSupplierMapper;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeptServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeptServiceImpl.java
index e25223f..2945edf 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeptServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeptServiceImpl.java
@@ -3,8 +3,8 @@ package com.qs.serve.modules.sys.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.util.IdUtil;
-import com.qs.serve.common.util.TreeUtil;
+import com.qs.serve.framework.base.util.IdUtil;
+import com.qs.serve.common.utils.TreeUtil;
 import com.qs.serve.modules.sys.entity.SysDept;
 import com.qs.serve.modules.sys.mapper.SysDeptMapper;
 import com.qs.serve.modules.sys.service.SysDeptService;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysNoticeServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysNoticeServiceImpl.java
index 3712ede..d2b1cf5 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysNoticeServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysNoticeServiceImpl.java
@@ -2,8 +2,8 @@ package com.qs.serve.modules.sys.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.util.Assert;
-import com.qs.serve.common.util.CollectionUtil;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.util.CollectionUtil;
 import com.qs.serve.modules.sys.common.consts.SysStatusConst;
 import com.qs.serve.modules.sys.entity.SysNotice;
 import com.qs.serve.modules.sys.entity.SysNoticeUser;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysPostServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysPostServiceImpl.java
index 32e8970..3bab0a7 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysPostServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysPostServiceImpl.java
@@ -2,10 +2,10 @@ package com.qs.serve.modules.sys.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.util.Assert;
+import com.qs.serve.common.exception.Assert;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.IdUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.framework.base.util.IdUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.sys.entity.SysPost;
 import com.qs.serve.modules.sys.mapper.SysPostMapper;
 import com.qs.serve.modules.sys.service.SysPostService;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysPostUserServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysPostUserServiceImpl.java
index f15e522..54fb2a8 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysPostUserServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysPostUserServiceImpl.java
@@ -2,15 +2,12 @@ package com.qs.serve.modules.sys.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.util.CollectionUtil;
+import com.qs.serve.framework.base.util.CollectionUtil;
 import com.qs.serve.modules.sys.entity.SysPost;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.sys.entity.bo.SysPostUserBo;
 import com.qs.serve.modules.sys.mapper.SysPostMapper;
 import com.qs.serve.modules.sys.mapper.SysUserMapper;
-import com.qs.serve.modules.sys.service.SysPostService;
-import com.qs.serve.modules.sys.service.SysUserService;
-import com.qs.serve.modules.tag.entity.TagData;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysRoleServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysRoleServiceImpl.java
index 3fc36ea..5781e69 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysRoleServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysRoleServiceImpl.java
@@ -2,9 +2,9 @@ package com.qs.serve.modules.sys.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.util.Assert;
+import com.qs.serve.common.exception.Assert;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.CollectionUtil;
+import com.qs.serve.framework.base.util.CollectionUtil;
 import com.qs.serve.modules.sys.entity.SysRole;
 import com.qs.serve.modules.sys.entity.SysUserRole;
 import com.qs.serve.modules.sys.mapper.SysRoleMapper;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysTenantServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysTenantServiceImpl.java
index aedafb9..1c4db42 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysTenantServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysTenantServiceImpl.java
@@ -1,7 +1,7 @@
 package com.qs.serve.modules.sys.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.model.consts.RedisCacheKeys;
+import com.qs.serve.framework.base.model.consts.RedisCacheKeys;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
 import com.qs.serve.modules.sys.entity.SysTenant;
 import com.qs.serve.modules.sys.mapper.SysTenantMapper;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserDetailsServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserDetailsServiceImpl.java
index b6d784e..36c19a5 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserDetailsServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserDetailsServiceImpl.java
@@ -1,7 +1,6 @@
 package com.qs.serve.modules.sys.service.impl;
 
-import com.qs.serve.common.framework.security.model.LoginUser;
-import com.qs.serve.modules.sys.entity.SysUser;
+import com.qs.serve.framework.base.framework.security.model.LoginUser;
 import com.qs.serve.modules.sys.service.SysUserService;
 import lombok.AllArgsConstructor;
 import org.springframework.security.core.userdetails.UserDetails;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserFlowApplication.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserFlowApplication.java
index ec093f9..4aff440 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserFlowApplication.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserFlowApplication.java
@@ -1,19 +1,13 @@
 package com.qs.serve.modules.sys.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.util.StringUtils;
-import com.qs.serve.modules.oms.entity.bo.SysFlowCancelBo;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.sys.mapper.SysUserMapper;
-import com.qs.serve.modules.tbs.entity.TbsCostApply;
 import com.qs.serve.modules.tbs.mapper.TbsCostApplyMapper;
-import com.qs.serve.modules.tbs.service.TbsCostApplyService;
 import com.qs.serve.modules.tzc.mapper.TzcPolicyMapper;
-import com.qs.serve.modules.vtb.entity.VtbVerification;
 import com.qs.serve.modules.vtb.mapper.VtbVerificationMapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserLoginServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserLoginServiceImpl.java
index dd578ea..527784d 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserLoginServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserLoginServiceImpl.java
@@ -2,10 +2,12 @@ package com.qs.serve.modules.sys.service.impl;
 
 import cn.hutool.crypto.SecureUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.framework.redis.RedisService;
-import com.qs.serve.common.framework.security.model.LoginUser;
-import com.qs.serve.common.model.consts.RedisCacheKeys;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.framework.base.framework.security.model.LoginUser;
+import com.qs.serve.framework.base.model.consts.RedisCacheKeys;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.sys.entity.dto.SysLoginByPhoneParam;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserRoleServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserRoleServiceImpl.java
index 71ce796..1f0ad98 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserRoleServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserRoleServiceImpl.java
@@ -2,8 +2,8 @@ package com.qs.serve.modules.sys.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.framework.base.util.CollectionUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.sys.entity.SysUserRole;
 import com.qs.serve.modules.sys.mapper.SysUserRoleMapper;
 import com.qs.serve.modules.sys.service.SysUserRoleService;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserSalesServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserSalesServiceImpl.java
index fead353..63d3e68 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserSalesServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserSalesServiceImpl.java
@@ -2,8 +2,7 @@ package com.qs.serve.modules.sys.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.util.Assert;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.utils.StringUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -12,9 +11,7 @@ import com.qs.serve.modules.sys.service.SysUserSalesService;
 import com.qs.serve.modules.sys.mapper.SysUserSalesMapper;
 
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java
index 5cb54eb..f57fd58 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/service/impl/SysUserServiceImpl.java
@@ -4,11 +4,14 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.DesensitizedUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.config.properties.SeeYonProperties;
-import com.qs.serve.common.framework.security.model.LoginUser;
-import com.qs.serve.common.framework.security.model.LoginUserType;
-import com.qs.serve.common.model.enums.HttpCode;
-import com.qs.serve.common.util.*;
+import com.qs.serve.framework.base.config.properties.SeeYonProperties;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.framework.security.model.LoginUser;
+import com.qs.serve.framework.base.framework.security.model.LoginUserType;
+import com.qs.serve.common.enums.HttpCode;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.ServletUtils;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bms.mapper.BmsSupplierMapper;
 import com.qs.serve.modules.bms.service.impl.BmsSupplierApplicationService;
 import com.qs.serve.modules.his.service.HisUserSupplierService;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/controller/TagCategoryController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/controller/TagCategoryController.java
index 0c99694..38c4afd 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/controller/TagCategoryController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/controller/TagCategoryController.java
@@ -1,22 +1,19 @@
 package com.qs.serve.modules.tag.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
-import com.qs.serve.common.util.TreeUtil;
-import com.qs.serve.modules.tag.entity.TagData;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
+import com.qs.serve.common.utils.TreeUtil;
 import com.qs.serve.modules.tag.entity.TagInfo;
 import com.qs.serve.modules.tag.entity.vo.TagCategoryTreeVo;
 import com.qs.serve.modules.tag.service.TagInfoService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import com.qs.serve.modules.tag.entity.TagCategory;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/controller/TagDataController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/controller/TagDataController.java
index 1a2a4ea..b899530 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/controller/TagDataController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/controller/TagDataController.java
@@ -2,14 +2,14 @@ package com.qs.serve.modules.tag.controller;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.dto.TargetObjectDTO;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.model.dto.TargetObjectDTO;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.framework.base.util.CollectionUtil;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.bms.entity.BmsChannel;
 import com.qs.serve.modules.bms.entity.BmsChannelPoint;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/controller/TagInfoController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/controller/TagInfoController.java
index f3dc360..209b5e9 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/controller/TagInfoController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/controller/TagInfoController.java
@@ -2,17 +2,18 @@ package com.qs.serve.modules.tag.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageHelper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.tag.entity.TagCategory;
 import com.qs.serve.modules.tag.service.TagCategoryService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import com.qs.serve.modules.tag.entity.so.TagInfoSo;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/entity/bo/TagInfoApiBindBo.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/entity/bo/TagInfoApiBindBo.java
index 7567ddf..3aa6b93 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/entity/bo/TagInfoApiBindBo.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/entity/bo/TagInfoApiBindBo.java
@@ -1,6 +1,6 @@
 package com.qs.serve.modules.tag.entity.bo;
 
-import com.qs.serve.common.model.dto.TargetObjectDTO;
+import com.qs.serve.framework.base.model.dto.TargetObjectDTO;
 import lombok.Data;
 
 import java.io.Serializable;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/entity/bo/TagInfoBindBo.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/entity/bo/TagInfoBindBo.java
index 7cb428e..f6c9721 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/entity/bo/TagInfoBindBo.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/entity/bo/TagInfoBindBo.java
@@ -1,8 +1,7 @@
 package com.qs.serve.modules.tag.entity.bo;
 
-import com.qs.serve.common.model.dto.TargetObjectDTO;
+import com.qs.serve.framework.base.model.dto.TargetObjectDTO;
 import lombok.Data;
-import org.hibernate.validator.constraints.Length;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/entity/bo/TagTargetObject2Bo.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/entity/bo/TagTargetObject2Bo.java
index 382eb80..3b74b02 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/entity/bo/TagTargetObject2Bo.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/entity/bo/TagTargetObject2Bo.java
@@ -1,12 +1,11 @@
 package com.qs.serve.modules.tag.entity.bo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.qs.serve.common.model.dto.TargetObjectDTO;
+import com.qs.serve.framework.base.model.dto.TargetObjectDTO;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDate;
-import java.util.List;
 
 /**
  * @author YenHex
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/entity/bo/TagTargetObject3Bo.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/entity/bo/TagTargetObject3Bo.java
index dd86e20..6870273 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/entity/bo/TagTargetObject3Bo.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/entity/bo/TagTargetObject3Bo.java
@@ -1,7 +1,7 @@
 package com.qs.serve.modules.tag.entity.bo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.qs.serve.common.model.dto.TargetObjectDTO;
+import com.qs.serve.framework.base.model.dto.TargetObjectDTO;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/entity/bo/TagTargetObjectBo.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/entity/bo/TagTargetObjectBo.java
index b30a24b..5ee4c0f 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/entity/bo/TagTargetObjectBo.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/entity/bo/TagTargetObjectBo.java
@@ -1,6 +1,6 @@
 package com.qs.serve.modules.tag.entity.bo;
 
-import com.qs.serve.common.model.dto.TargetObjectDTO;
+import com.qs.serve.framework.base.model.dto.TargetObjectDTO;
 import lombok.Data;
 
 import java.util.List;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/entity/vo/TagCategoryTreeVo.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/entity/vo/TagCategoryTreeVo.java
index bceebbd..6966ef6 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/entity/vo/TagCategoryTreeVo.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/entity/vo/TagCategoryTreeVo.java
@@ -1,6 +1,6 @@
 package com.qs.serve.modules.tag.entity.vo;
 
-import com.qs.serve.common.model.dto.TreeNode;
+import com.qs.serve.framework.base.model.TreeNode;
 import lombok.Data;
 
 /**
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/service/impl/TagCategoryServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/service/impl/TagCategoryServiceImpl.java
index 1264527..69cb03c 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/service/impl/TagCategoryServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/service/impl/TagCategoryServiceImpl.java
@@ -2,8 +2,7 @@ package com.qs.serve.modules.tag.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.util.Assert;
-import com.qs.serve.modules.goods.entity.GoodsCategory;
+import com.qs.serve.common.exception.Assert;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/util/TagFiledUtil.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/util/TagFiledUtil.java
index 81c037f..01536db 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/util/TagFiledUtil.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tag/util/TagFiledUtil.java
@@ -1,7 +1,7 @@
 package com.qs.serve.modules.tag.util;
 
 import cn.hutool.core.collection.CollUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.goods.entity.GoodsSpu;
 import com.qs.serve.modules.his.entity.HisUserSupplier;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java
index b9881ae..c9a04aa 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java
@@ -1,6 +1,6 @@
 package com.qs.serve.modules.tbs.common;
 
-import com.qs.serve.common.config.DevEnvironmentConfig;
+import com.qs.serve.framework.base.config.DevEnvironmentConfig;
 
 /**
  * @author YenHex
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/dto/CostSortWrapper.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/dto/CostSortWrapper.java
index cd2ccc2..bd2ea1a 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/dto/CostSortWrapper.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/dto/CostSortWrapper.java
@@ -1,7 +1,6 @@
 package com.qs.serve.modules.tbs.common.dto;
 
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.modules.tbs.entity.TbsActivity;
+import com.qs.serve.framework.base.util.CollectionUtil;
 import com.qs.serve.modules.tbs.entity.TbsBudget;
 import com.qs.serve.modules.tbs.entity.TbsBudgetCondition;
 import com.qs.serve.modules.tbs.entity.TbsScheduleItemBudget;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/BirHttpUtil.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/BirHttpUtil.java
index c17786b..7c89ed0 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/BirHttpUtil.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/BirHttpUtil.java
@@ -2,10 +2,12 @@ package com.qs.serve.modules.tbs.common.util;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.qs.serve.common.config.properties.ProjectProperties;
-import com.qs.serve.common.model.consts.GySysConst;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.*;
+import com.qs.serve.framework.base.config.properties.ProjectProperties;
+import com.qs.serve.framework.base.model.consts.GySysConst;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.ServletUtils;
 import com.qs.serve.modules.tbs.entity.dto.TbsCostSubItem;
 import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/CostSort2WrapperUtil.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/CostSort2WrapperUtil.java
index a71e346..97190f2 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/CostSort2WrapperUtil.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/CostSort2WrapperUtil.java
@@ -1,10 +1,5 @@
 package com.qs.serve.modules.tbs.common.util;
 
-import com.qs.serve.common.util.Assert;
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.modules.tbs.common.dto.CostSortWrapper;
-import com.qs.serve.modules.tbs.entity.TbsActivity;
-import com.qs.serve.modules.tbs.entity.TbsBudgetCondition;
 import com.qs.serve.modules.tbs.entity.TbsScheduleItemBudget;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/CostSortWrapperUtil.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/CostSortWrapperUtil.java
index 900c7b8..626913f 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/CostSortWrapperUtil.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/CostSortWrapperUtil.java
@@ -1,10 +1,9 @@
 package com.qs.serve.modules.tbs.common.util;
 
-import com.qs.serve.common.util.Assert;
-import com.qs.serve.common.util.CollectionUtil;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.util.CollectionUtil;
 import com.qs.serve.modules.tbs.common.dto.CostSortWrapper;
 import com.qs.serve.modules.tbs.entity.TbsActivity;
-import com.qs.serve.modules.tbs.entity.TbsBudget;
 import com.qs.serve.modules.tbs.entity.TbsBudgetCondition;
 import com.qs.serve.modules.tbs.entity.TbsScheduleItemBudget;
 import lombok.Data;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/TbsActivityUtil.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/TbsActivityUtil.java
index 974fafd..04029ef 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/TbsActivityUtil.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/TbsActivityUtil.java
@@ -1,13 +1,12 @@
 package com.qs.serve.modules.tbs.common.util;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.util.SpringUtils;
+import com.qs.serve.framework.base.util.SpringUtils;
 import com.qs.serve.modules.sys.entity.SysConfig;
 import com.qs.serve.modules.sys.service.SysConfigService;
 import com.qs.serve.modules.tbs.entity.TbsActivity;
 import org.springframework.beans.BeansException;
 
-import javax.swing.*;
 import java.time.LocalDate;
 
 /**
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/TbsBudgetConditionUtil.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/TbsBudgetConditionUtil.java
index 634fe52..9bdf723 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/TbsBudgetConditionUtil.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/TbsBudgetConditionUtil.java
@@ -1,8 +1,8 @@
 package com.qs.serve.modules.tbs.common.util;
 
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.common.util.SpringUtils;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.framework.base.util.CollectionUtil;
+import com.qs.serve.framework.base.util.SpringUtils;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.goods.entity.GoodsCategory;
 import com.qs.serve.modules.goods.entity.GoodsSku;
 import com.qs.serve.modules.goods.entity.GoodsSpu;
@@ -10,10 +10,8 @@ import com.qs.serve.modules.goods.service.GoodsCategoryService;
 import com.qs.serve.modules.goods.service.GoodsSkuService;
 import com.qs.serve.modules.goods.service.GoodsSpuService;
 import com.qs.serve.modules.tbs.common.TbsGoodsType;
-import com.qs.serve.modules.tbs.entity.TbsBudget;
 import com.qs.serve.modules.tbs.entity.TbsBudgetCondition;
 
-import javax.swing.*;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/TbsBudgetCostUtil.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/TbsBudgetCostUtil.java
index 65320f3..9f96659 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/TbsBudgetCostUtil.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/TbsBudgetCostUtil.java
@@ -1,7 +1,7 @@
 package com.qs.serve.modules.tbs.common.util;
 
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.common.util.CopierUtil;
+import com.qs.serve.framework.base.util.CollectionUtil;
+import com.qs.serve.common.utils.CopierUtil;
 import com.qs.serve.modules.tbs.entity.TbsActivityCenterGoods;
 import com.qs.serve.modules.tbs.entity.TbsBudgetCostItem;
 import org.jetbrains.annotations.NotNull;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/TbsBudgetLogBuildUtil.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/TbsBudgetLogBuildUtil.java
index 3a9815b..c34a242 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/TbsBudgetLogBuildUtil.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/util/TbsBudgetLogBuildUtil.java
@@ -1,8 +1,7 @@
 package com.qs.serve.modules.tbs.common.util;
 
-import com.qs.serve.common.model.enums.BudgetLogOptFlag;
-import com.qs.serve.common.util.Assert;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.enums.BudgetLogOptFlag;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.tbs.entity.*;
 import com.qs.serve.modules.tzc.entity.TzcPolicy;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java
index aed4c36..20680c3 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController.java
@@ -2,15 +2,15 @@ package com.qs.serve.modules.tbs.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.qs.serve.common.model.annotation.LimitSubmit;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
+import com.qs.serve.common.annotation.LimitSubmit;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.sys.service.SysUserService;
 import com.qs.serve.modules.tbs.common.TbsActivityState;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController2.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController2.java
index 71d3cb3..9861919 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController2.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityController2.java
@@ -1,10 +1,10 @@
 package com.qs.serve.modules.tbs.controller;
 
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.CommonIdsParam;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.dto.CommonIdsParam;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
 import com.qs.serve.modules.tbs.entity.*;
 import com.qs.serve.modules.tbs.service.*;
 import com.qs.serve.modules.vtb.service.VtbFundFlowService;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityPayConditionController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityPayConditionController.java
index 2812e6c..713f4c2 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityPayConditionController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityPayConditionController.java
@@ -1,12 +1,16 @@
 package com.qs.serve.modules.tbs.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.tbs.common.TbsCostApplyState;
 import com.qs.serve.modules.tbs.entity.TbsActivity;
 import com.qs.serve.modules.tbs.entity.TbsCostApply;
@@ -15,7 +19,6 @@ import com.qs.serve.modules.tbs.service.TbsActivityService;
 import com.qs.serve.modules.tbs.service.TbsCostApplyService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import com.qs.serve.modules.tbs.entity.so.TbsActivityPayConditionSo;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivitySlottingFeeController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivitySlottingFeeController.java
index aee0644..9c4f03d 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivitySlottingFeeController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivitySlottingFeeController.java
@@ -2,23 +2,16 @@ package com.qs.serve.modules.tbs.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.tbs.entity.*;
 import com.qs.serve.modules.tbs.service.*;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivitySubjectYarnController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivitySubjectYarnController.java
index ba1ba81..e453731 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivitySubjectYarnController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivitySubjectYarnController.java
@@ -1,23 +1,19 @@
 package com.qs.serve.modules.tbs.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import com.qs.serve.modules.tbs.entity.TbsActivitySubjectYarn;
 import com.qs.serve.modules.tbs.service.TbsActivitySubjectYarnService;
 
-import javax.validation.Valid;
 import java.util.List;
 
 /**
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java
index 02cf931..8e78775 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateController.java
@@ -1,12 +1,15 @@
 package com.qs.serve.modules.tbs.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.service.BmsRegionUserService;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateLogController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateLogController.java
index debd16f..b73e0b3 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateLogController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsActivityTemplateLogController.java
@@ -1,14 +1,14 @@
 package com.qs.serve.modules.tbs.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.StringUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -18,7 +18,6 @@ import com.qs.serve.modules.tbs.entity.so.TbsActivityTemplateLogSo;
 import com.qs.serve.modules.tbs.entity.TbsActivityTemplateLog;
 import com.qs.serve.modules.tbs.service.TbsActivityTemplateLogService;
 
-import javax.validation.Valid;
 import java.util.List;
 
 /**
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetBatchController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetBatchController.java
index 576e77a..e06fc1e 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetBatchController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetBatchController.java
@@ -1,16 +1,14 @@
 package com.qs.serve.modules.tbs.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.LimitSubmit;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.annotation.LimitSubmit;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.framework.base.util.CollectionUtil;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.seeyon.entity.bo.CtpAddNodeParam;
 import com.qs.serve.modules.sys.entity.SysAttach;
 import com.qs.serve.modules.sys.service.SysAttachService;
@@ -26,7 +24,6 @@ import com.qs.serve.modules.tbs.service.TbsBudgetChangeService;
 import com.qs.serve.modules.tbs.service.impl.TbsBudgetBatchOperationServiceImpl;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import com.qs.serve.modules.tbs.entity.TbsBudgetBatch;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetChangeController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetChangeController.java
index d47b002..562b533 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetChangeController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetChangeController.java
@@ -1,10 +1,11 @@
 package com.qs.serve.modules.tbs.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.framework.manager.AsyncManager;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.*;
+import com.qs.serve.framework.base.framework.manager.AsyncManager;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.sync.AsyncFactory;
 import com.qs.serve.modules.sys.service.SysAttachService;
 import com.qs.serve.modules.tbs.common.TbsCommonCheckState;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetCheckController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetCheckController.java
index 359a075..8485839 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetCheckController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetCheckController.java
@@ -1,10 +1,10 @@
 package com.qs.serve.modules.tbs.controller;
 
-import com.qs.serve.common.model.annotation.LimitSubmit;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
+import com.qs.serve.common.annotation.LimitSubmit;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
 import com.qs.serve.modules.seeyon.entity.bo.CtpAddNodeParam;
 import com.qs.serve.modules.tbs.entity.TbsBudget;
 import com.qs.serve.modules.tbs.entity.TbsBudgetChange;
@@ -18,7 +18,6 @@ import com.qs.serve.modules.tbs.service.impl.TbsBudgetBatchOperationServiceImpl;
 import com.qs.serve.modules.tbs.service.impl.TbsBudgetChangeOperationServiceImpl;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java
index 238269e..23b2781 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java
@@ -2,13 +2,15 @@ package com.qs.serve.modules.tbs.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.enums.BudgetLogOptFlag;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.common.enums.BudgetLogOptFlag;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.sys.service.SysUserService;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetLogController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetLogController.java
index ac81472..0b3293b 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetLogController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetLogController.java
@@ -1,16 +1,16 @@
 package com.qs.serve.modules.tbs.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.LimitSubmit;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.BudgetLogOptFlag;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
+import com.qs.serve.common.annotation.LimitSubmit;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.BudgetLogOptFlag;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.framework.base.util.CollectionUtil;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.CopierUtil;
 import com.qs.serve.modules.tbs.entity.TbsBudget;
 import com.qs.serve.modules.tbs.entity.TbsScheduleItemBudget;
 import com.qs.serve.modules.tbs.entity.dto.TbsBudgetLogWithAmount;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetPlanController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetPlanController.java
index f223cd6..2bda70c 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetPlanController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetPlanController.java
@@ -1,19 +1,18 @@
 package com.qs.serve.modules.tbs.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.tbs.entity.TbsBudgetPlan;
 import com.qs.serve.modules.tbs.service.TbsBudgetPlanService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyCheckController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyCheckController.java
index 71af766..fe3b3a3 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyCheckController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyCheckController.java
@@ -1,13 +1,13 @@
 package com.qs.serve.modules.tbs.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.LimitSubmit;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.annotation.LimitSubmit;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.framework.base.util.*;
 import com.qs.serve.modules.bir.consts.BirActivityCenterGoodsUtil;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java
index 14c07fc..466092b 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java
@@ -3,13 +3,16 @@ package com.qs.serve.modules.tbs.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.qs.serve.common.model.annotation.LimitSubmit;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.annotation.LimitSubmit;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bir.consts.BirActivityCenterGoodsUtil;
 import com.qs.serve.modules.bms.entity.BmsRegion2;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyTestController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyTestController.java
index 7917759..6e29b14 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyTestController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyTestController.java
@@ -2,17 +2,10 @@ package com.qs.serve.modules.tbs.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.qs.serve.common.model.annotation.LimitSubmit;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.BudgetLogOptFlag;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.*;
-import com.qs.serve.modules.bms.entity.BmsRegion2;
-import com.qs.serve.modules.bms.entity.BmsSupplier;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BudgetLogOptFlag;
+import com.qs.serve.framework.base.util.*;
 import com.qs.serve.modules.bms.service.BmsRegion2Service;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
 import com.qs.serve.modules.sys.entity.SysTableTemp;
@@ -24,16 +17,7 @@ import com.qs.serve.modules.sys.service.SysUserService;
 import com.qs.serve.modules.tbs.common.TbsCostApplyState;
 import com.qs.serve.modules.tbs.common.util.TbsBudgetLogBuildUtil;
 import com.qs.serve.modules.tbs.entity.*;
-import com.qs.serve.modules.tbs.entity.bo.TbsActivityBo;
-import com.qs.serve.modules.tbs.entity.bo.TbsCostApplyActivityBo;
-import com.qs.serve.modules.tbs.entity.bo.TbsCostApplyBo;
-import com.qs.serve.modules.tbs.entity.dto.TbsActNotMatchAmtCenterGoods;
-import com.qs.serve.modules.tbs.entity.dto.TbsBudgetScheduleWithAmount;
-import com.qs.serve.modules.tbs.entity.dto.TbsCostBudgetRelateInfo;
-import com.qs.serve.modules.tbs.entity.dto.TbsCostErrorBudgetDTO;
 import com.qs.serve.modules.tbs.entity.vo.TbsBudgetTableResultVo;
-import com.qs.serve.modules.tbs.entity.vo.TbsBudgetTableVo;
-import com.qs.serve.modules.tbs.entity.vo.TbsCostApplyVo;
 import com.qs.serve.modules.tbs.mapper.TbsBudgetConditionMapper;
 import com.qs.serve.modules.tbs.mapper.TbsBudgetLogMapper;
 import com.qs.serve.modules.tbs.mapper.TbsCostApplyMapper;
@@ -44,16 +28,12 @@ import com.qs.serve.modules.vtb.entity.VtbVerification;
 import com.qs.serve.modules.vtb.mapper.VtbVerificationMapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
-import javax.validation.Valid;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostContractController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostContractController.java
index 56c1bc1..42f6526 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostContractController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostContractController.java
@@ -1,15 +1,14 @@
 package com.qs.serve.modules.tbs.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.framework.base.util.CollectionUtil;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.CopierUtil;
 import com.qs.serve.modules.bms.entity.BmsDutyInfo;
 import com.qs.serve.modules.bms.service.BmsDutyInfoService;
 import com.qs.serve.modules.sys.entity.SysAttach;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostTodoCheckController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostTodoCheckController.java
index 031b995..a322f76 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostTodoCheckController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostTodoCheckController.java
@@ -1,11 +1,11 @@
 package com.qs.serve.modules.tbs.controller;
 
-import com.qs.serve.common.model.annotation.LimitSubmit;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
+import com.qs.serve.common.annotation.LimitSubmit;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
 import com.qs.serve.modules.seeyon.entity.CtpAffairQo;
 import com.qs.serve.modules.seeyon.entity.bo.CtpAddNodeParam;
 import com.qs.serve.modules.tbs.entity.TbsCostTodo;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostTodoController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostTodoController.java
index 6403463..5c9f561 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostTodoController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostTodoController.java
@@ -1,9 +1,11 @@
 package com.qs.serve.modules.tbs.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.*;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
 import com.qs.serve.modules.sys.service.SysAttachService;
 import com.qs.serve.modules.tbs.common.TbsCommonCheckState;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostUnItemController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostUnItemController.java
index 9133fd2..c25320c 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostUnItemController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostUnItemController.java
@@ -1,14 +1,13 @@
 package com.qs.serve.modules.tbs.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.CopierUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -18,7 +17,6 @@ import com.qs.serve.modules.tbs.entity.so.TbsCostUnItemSo;
 import com.qs.serve.modules.tbs.entity.TbsCostUnItem;
 import com.qs.serve.modules.tbs.service.TbsCostUnItemService;
 
-import javax.validation.Valid;
 import java.util.List;
 
 /**
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsDealErrorController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsDealErrorController.java
index b2e3e8e..998f277 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsDealErrorController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsDealErrorController.java
@@ -1,22 +1,6 @@
 package com.qs.serve.modules.tbs.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.LimitSubmit;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.BudgetLogOptFlag;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.modules.tbs.entity.TbsBudget;
-import com.qs.serve.modules.tbs.entity.TbsBudgetLog;
-import com.qs.serve.modules.tbs.entity.TbsScheduleItemBudget;
-import com.qs.serve.modules.tbs.entity.so.TbsBudgetLogSo;
-import com.qs.serve.modules.tbs.entity.so.TbsBudgetSo;
-import com.qs.serve.modules.tbs.entity.vo.TbsBudgetVo;
+import com.qs.serve.framework.base.model.R;
 import com.qs.serve.modules.tbs.mapper.TbsBudgetLogMapper;
 import com.qs.serve.modules.tbs.mapper.TbsBudgetMapper;
 import com.qs.serve.modules.tbs.service.TbsBudgetLogService;
@@ -26,17 +10,9 @@ import com.qs.serve.modules.tbs.service.impl.TbsDealErrorApplication;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
 /**
  * 预算 预算日志
  * @author YenHex
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleController.java
index ff884e6..2f59487 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleController.java
@@ -1,19 +1,17 @@
 package com.qs.serve.modules.tbs.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.Assert;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.modules.bms.entity.BmsSubject;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.CopierUtil;
 import com.qs.serve.modules.tbs.entity.TbsBudget;
 import com.qs.serve.modules.tbs.entity.TbsScheduleItem;
 import com.qs.serve.modules.tbs.service.TbsBudgetService;
-import com.qs.serve.modules.tbs.service.TbsScheduleItemBudgetService;
 import com.qs.serve.modules.tbs.service.TbsScheduleItemService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -21,7 +19,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import com.qs.serve.modules.tbs.entity.vo.TbsScheduleVo;
-import com.qs.serve.modules.tbs.entity.bo.TbsScheduleBo;
 import com.qs.serve.modules.tbs.entity.TbsSchedule;
 import com.qs.serve.modules.tbs.service.TbsScheduleService;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleItemBudgetController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleItemBudgetController.java
index 186d577..3481578 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleItemBudgetController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleItemBudgetController.java
@@ -1,14 +1,13 @@
 package com.qs.serve.modules.tbs.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.Assert;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.CopierUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleItemController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleItemController.java
index c41860c..eb04531 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleItemController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsScheduleItemController.java
@@ -1,13 +1,13 @@
 package com.qs.serve.modules.tbs.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.CopierUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java
index aac5600..7d9d199 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java
@@ -1,7 +1,6 @@
 package com.qs.serve.modules.tbs.entity;
 
 import java.math.BigDecimal;
-import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -10,7 +9,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
+import com.qs.serve.mbp.handler.SplitStringTypeHandler;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import lombok.Data;
 import org.apache.ibatis.type.JdbcType;
@@ -19,7 +18,6 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotBlank;
-import java.time.Period;
 import java.time.temporal.ChronoUnit;
 import java.util.List;
 /**
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityCenterGoods.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityCenterGoods.java
index c6b5755..d191567 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityCenterGoods.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityCenterGoods.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.qs.serve.common.util.CopierUtil;
+import com.qs.serve.common.utils.CopierUtil;
 import com.qs.serve.modules.tbs.common.TbsGoodsType;
 import com.qs.serve.modules.tbs.entity.dto.TbsCenterGoodsGroupDTO;
 import lombok.Data;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityGoods.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityGoods.java
index acba267..4115d30 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityGoods.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityGoods.java
@@ -1,15 +1,13 @@
 package com.qs.serve.modules.tbs.entity;
 
-import java.time.LocalDate;
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.tbs.common.TbsGoodsType;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudget.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudget.java
index 10c770a..89b6eda 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudget.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudget.java
@@ -1,8 +1,6 @@
 package com.qs.serve.modules.tbs.entity;
 
-import java.time.LocalDate;
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -10,7 +8,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
+import com.qs.serve.mbp.handler.SplitStringTypeHandler;
 import lombok.Data;
 import org.apache.ibatis.type.JdbcType;
 import org.hibernate.validator.constraints.Length;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetBatch.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetBatch.java
index 925eaa9..39d6393 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetBatch.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetBatch.java
@@ -1,8 +1,6 @@
 package com.qs.serve.modules.tbs.entity;
 
-import java.time.LocalDate;
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -10,7 +8,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
+import com.qs.serve.mbp.handler.SplitStringTypeHandler;
 import lombok.Data;
 import org.apache.ibatis.type.JdbcType;
 import org.hibernate.validator.constraints.Length;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetChange.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetChange.java
index 2d8805a..49d191d 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetChange.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetChange.java
@@ -1,8 +1,6 @@
 package com.qs.serve.modules.tbs.entity;
 
-import java.time.LocalDate;
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -10,7 +8,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
+import com.qs.serve.mbp.handler.SplitStringTypeHandler;
 import lombok.Data;
 import org.apache.ibatis.type.JdbcType;
 import org.hibernate.validator.constraints.Length;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetCostItem.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetCostItem.java
index 517181b..a0b59c5 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetCostItem.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetCostItem.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.qs.serve.common.model.enums.BudgetLogOptFlag;
+import com.qs.serve.common.enums.BudgetLogOptFlag;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.tbs.common.TbsGoodsType;
 import com.qs.serve.modules.tbs.common.util.TbsBudgetLogBuildUtil;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetLog.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetLog.java
index 2c88736..0564c36 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetLog.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetLog.java
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.qs.serve.common.model.enums.BudgetLogOptFlag;
+import com.qs.serve.common.enums.BudgetLogOptFlag;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 import org.springframework.format.annotation.DateTimeFormat;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostContract.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostContract.java
index 187536e..659ce8d 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostContract.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostContract.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
+import com.qs.serve.mbp.handler.SplitStringTypeHandler;
 import lombok.Data;
 import org.apache.ibatis.type.JdbcType;
 import org.hibernate.validator.constraints.Length;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostTodo.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostTodo.java
index 3332025..aff54d4 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostTodo.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostTodo.java
@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
+import com.qs.serve.mbp.handler.SplitStringTypeHandler;
 import lombok.Data;
 import org.apache.ibatis.type.JdbcType;
 import org.hibernate.validator.constraints.Length;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsAffairCommitBo.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsAffairCommitBo.java
index 271dd43..1de55e8 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsAffairCommitBo.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsAffairCommitBo.java
@@ -1,9 +1,6 @@
 package com.qs.serve.modules.tbs.entity.bo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
 import lombok.Data;
-import org.apache.ibatis.type.JdbcType;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotNull;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsSubmitToDoBo.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsSubmitToDoBo.java
index a28f169..b29426f 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsSubmitToDoBo.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsSubmitToDoBo.java
@@ -1,9 +1,6 @@
 package com.qs.serve.modules.tbs.entity.bo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
 import lombok.Data;
-import org.apache.ibatis.type.JdbcType;
 
 /**
  * @author YenHex
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsBudgetItemCostResult.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsBudgetItemCostResult.java
index f74e247..d2a5e70 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsBudgetItemCostResult.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsBudgetItemCostResult.java
@@ -1,8 +1,5 @@
 package com.qs.serve.modules.tbs.entity.dto;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.modules.tbs.entity.TbsBudgetCostItem;
 import com.qs.serve.modules.tbs.entity.TbsBudgetCostItemPolicy;
 import com.qs.serve.modules.tzc.entity.TzcPolicyItem;
 import lombok.Data;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/so/TbsScheduleItemSearch.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/so/TbsScheduleItemSearch.java
index c85128b..1acd23c 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/so/TbsScheduleItemSearch.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/so/TbsScheduleItemSearch.java
@@ -1,6 +1,6 @@
 package com.qs.serve.modules.tbs.entity.so;
 
-import com.qs.serve.common.util.CollectionUtil;
+import com.qs.serve.framework.base.util.CollectionUtil;
 import lombok.Data;
 
 import java.util.List;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsBudgetVo.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsBudgetVo.java
index dd11da1..c117747 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsBudgetVo.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsBudgetVo.java
@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
+import com.qs.serve.mbp.handler.SplitStringTypeHandler;
 import com.qs.serve.modules.tbs.entity.TbsBudgetCondition;
 import com.qs.serve.modules.tbs.entity.TbsScheduleItemBudget;
 import lombok.Data;
@@ -15,7 +15,6 @@ import org.springframework.format.annotation.DateTimeFormat;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/mapper/TbsBudgetMatchMapper.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/mapper/TbsBudgetMatchMapper.java
index b799cff..ffc6551 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/mapper/TbsBudgetMatchMapper.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/mapper/TbsBudgetMatchMapper.java
@@ -1,6 +1,6 @@
 package com.qs.serve.modules.tbs.mapper;
 
-import com.qs.serve.common.model.AmountDTO;
+import com.qs.serve.framework.base.model.AmountDTO;
 import com.qs.serve.modules.tbs.entity.TbsActivityCenterGoods;
 import com.qs.serve.modules.tbs.entity.TbsScheduleItemBudget;
 import org.apache.ibatis.annotations.Param;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsActivityApplicationService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsActivityApplicationService.java
index 210d8b0..5ae0e4f 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsActivityApplicationService.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsActivityApplicationService.java
@@ -1,36 +1,25 @@
 package com.qs.serve.modules.tbs.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.consts.SysConfigKey;
-import com.qs.serve.common.util.Assert;
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.modules.bms.entity.BmsSubject;
-import com.qs.serve.modules.bms.entity.BmsSupplier;
+import com.qs.serve.framework.base.model.consts.SysConfigKey;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.util.CollectionUtil;
+import com.qs.serve.common.utils.CopierUtil;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
 import com.qs.serve.modules.data.entity.DataAffairCommit;
 import com.qs.serve.modules.data.service.DataAffairCommitService;
-import com.qs.serve.modules.goods.entity.dto.TbsCenterDto;
 import com.qs.serve.modules.sys.service.SysConfigService;
-import com.qs.serve.modules.tbs.common.TbsGoodsType;
 import com.qs.serve.modules.tbs.common.util.TbsBudgetCostUtil;
 import com.qs.serve.modules.tbs.entity.*;
 import com.qs.serve.modules.tbs.entity.bo.TbsActivityBo;
 import com.qs.serve.modules.tbs.entity.bo.TbsActivitySubjectBo;
-import com.qs.serve.modules.tbs.entity.dto.TbsBudgetCostResult;
 import com.qs.serve.modules.tbs.entity.vo.TbsBudgetMatchVo;
-import com.qs.serve.modules.tbs.entity.vo.TbsBudgetTableVo;
-import com.qs.serve.modules.tbs.mapper.TbsActivityGoodsMapper;
 import com.qs.serve.modules.tbs.mapper.TbsActivityMapper;
 import com.qs.serve.modules.tbs.mapper.TbsBudgetMapper;
 import com.qs.serve.modules.tbs.service.impl.TbsActivityServiceImpl;
-import com.qs.serve.modules.vtb.entity.VtbFundFlow;
-import com.qs.serve.modules.vtb.entity.VtbVerification;
 import com.qs.serve.modules.vtb.service.VtbVerificationService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.checkerframework.checker.units.qual.A;
-import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsActivityDebugApplicationService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsActivityDebugApplicationService.java
index b6960e8..e7dad11 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsActivityDebugApplicationService.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsActivityDebugApplicationService.java
@@ -1,26 +1,19 @@
 package com.qs.serve.modules.tbs.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.framework.base.util.CollectionUtil;
+import com.qs.serve.common.utils.CopierUtil;
 import com.qs.serve.modules.bir.consts.BirActivityCenterGoodsUtil;
 import com.qs.serve.modules.tbs.entity.*;
 import com.qs.serve.modules.tbs.mapper.*;
-import com.qs.serve.modules.vtb.entity.VtbVerification;
-import com.qs.serve.modules.vtb.entity.VtbVerificationSubject;
 import com.qs.serve.modules.vtb.mapper.VtbVerificationMapper;
-import com.qs.serve.modules.vtb.mapper.VtbVerificationSubjectMapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java
index a92b673..3c28379 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java
@@ -1,8 +1,11 @@
 package com.qs.serve.modules.tbs.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.consts.SysConfigKey;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.model.consts.SysConfigKey;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.ServletUtils;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.sys.service.SysConfigService;
 import com.qs.serve.modules.tbs.common.TbsGoodsType;
 import com.qs.serve.modules.tbs.common.dto.CostSortWrapper;
@@ -24,7 +27,6 @@ import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.time.Duration;
 import java.util.*;
 import java.util.stream.Collectors;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetLogService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetLogService.java
index 52fb7b2..bdeb129 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetLogService.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetLogService.java
@@ -1,13 +1,7 @@
 package com.qs.serve.modules.tbs.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qs.serve.common.model.enums.BudgetLogOptFlag;
-import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.tbs.entity.*;
-import com.qs.serve.modules.tzc.entity.TzcPolicy;
-import com.qs.serve.modules.tzc.entity.TzcPolicyItem;
-
-import java.math.BigDecimal;
 
 /**
  * 预算日志 服务接口
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetMatchApplication.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetMatchApplication.java
index b57e8ed..9ca8159 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetMatchApplication.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetMatchApplication.java
@@ -1,9 +1,8 @@
 package com.qs.serve.modules.tbs.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.AmountDTO;
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.framework.base.model.AmountDTO;
+import com.qs.serve.framework.base.util.CollectionUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.tbs.common.TbsCostApplyState;
 import com.qs.serve.modules.tbs.common.TbsGoodsType;
 import com.qs.serve.modules.tbs.common.util.CostSort2WrapperUtil;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetReleaseApplicationService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetReleaseApplicationService.java
index e997e36..c07bd64 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetReleaseApplicationService.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetReleaseApplicationService.java
@@ -2,8 +2,8 @@ package com.qs.serve.modules.tbs.service;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.enums.BudgetLogOptFlag;
-import com.qs.serve.common.util.CollectionUtil;
+import com.qs.serve.common.enums.BudgetLogOptFlag;
+import com.qs.serve.framework.base.util.CollectionUtil;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.tbs.common.util.TbsBudgetLogBuildUtil;
 import com.qs.serve.modules.tbs.entity.*;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetService.java
index b8b57ee..0df9867 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetService.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetService.java
@@ -1,17 +1,10 @@
 package com.qs.serve.modules.tbs.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qs.serve.common.model.enums.BudgetLogOptFlag;
-import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.tbs.entity.TbsBudget;
-import com.qs.serve.modules.tbs.entity.TbsBudgetLog;
-import com.qs.serve.modules.tbs.entity.TbsScheduleItemBudget;
 import com.qs.serve.modules.tbs.entity.bo.*;
 import com.qs.serve.modules.tbs.entity.vo.TbsBudgetVo;
 
-import java.math.BigDecimal;
-import java.util.List;
-
 /**
  * 预算 服务接口
  * @author YenHex
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsCenterDtoService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsCenterDtoService.java
index a025e23..0066bf3 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsCenterDtoService.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsCenterDtoService.java
@@ -1,7 +1,7 @@
 package com.qs.serve.modules.tbs.service;
 
-import com.qs.serve.common.util.Assert;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bms.entity.BmsCostCenter;
 import com.qs.serve.modules.bms.entity.BmsRegion;
 import com.qs.serve.modules.bms.entity.BmsRegion2;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsCostApplyPart1Service.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsCostApplyPart1Service.java
index ba5f859..274e68f 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsCostApplyPart1Service.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsCostApplyPart1Service.java
@@ -1,11 +1,10 @@
 package com.qs.serve.modules.tbs.service;
 
-import com.qs.serve.common.model.dto.R;
+import com.qs.serve.framework.base.model.R;
 import com.qs.serve.modules.tbs.entity.TbsActivity;
 import com.qs.serve.modules.tbs.entity.TbsCostApply;
 import com.qs.serve.modules.tbs.entity.bo.TbsActivityDefaultCenterBo;
 import com.qs.serve.modules.tbs.entity.vo.TbsActivityDefaultCenterVo;
-import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * @author YenHex
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsCostApplyService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsCostApplyService.java
index db0fa0d..976a472 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsCostApplyService.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/TbsCostApplyService.java
@@ -1,14 +1,10 @@
 package com.qs.serve.modules.tbs.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.modules.bms.entity.BmsApplyMessage;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.tbs.entity.TbsActivityTemplate;
 import com.qs.serve.modules.tbs.entity.TbsCostApply;
-import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
 import java.util.List;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java
index 59e18a9..13eca24 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java
@@ -4,8 +4,10 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.model.consts.SysConfigKey;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bms.entity.*;
 import com.qs.serve.modules.bms.mapper.BmsSubjectFormMapper;
 import com.qs.serve.modules.bms.service.*;
@@ -16,12 +18,8 @@ import com.qs.serve.modules.goods.entity.dto.TbsCenterDto;
 import com.qs.serve.modules.goods.service.GoodsCategoryService;
 import com.qs.serve.modules.goods.service.GoodsSkuService;
 import com.qs.serve.modules.goods.service.GoodsSpuService;
-import com.qs.serve.modules.sys.entity.SysConfig;
-import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.sys.service.SysConfigService;
-import com.qs.serve.modules.sys.service.SysUserService;
 import com.qs.serve.modules.tbs.common.TbsActivityState;
-import com.qs.serve.modules.tbs.common.TbsCenterType;
 import com.qs.serve.modules.tbs.common.TbsCostApplyState;
 import com.qs.serve.modules.tbs.common.TbsGoodsType;
 import com.qs.serve.modules.tbs.entity.*;
@@ -31,14 +29,11 @@ import com.qs.serve.modules.tbs.mapper.*;
 import com.qs.serve.modules.tbs.service.*;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.ibatis.annotations.One;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateLogServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateLogServiceImpl.java
index 6eace50..411bcfc 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateLogServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateLogServiceImpl.java
@@ -1,7 +1,6 @@
 package com.qs.serve.modules.tbs.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.util.CopierUtil;
 import com.qs.serve.modules.tbs.entity.TbsActivityTemplate;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateRegionServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateRegionServiceImpl.java
index 615381b..4902a8a 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateRegionServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateRegionServiceImpl.java
@@ -2,10 +2,9 @@ package com.qs.serve.modules.tbs.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.util.CollectionUtil;
+import com.qs.serve.framework.base.util.CollectionUtil;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
-import com.qs.serve.modules.tbs.entity.TbsActivityTemplate;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateServiceImpl.java
index ea00939..f52d3ca 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityTemplateServiceImpl.java
@@ -2,10 +2,10 @@ package com.qs.serve.modules.tbs.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.util.Assert;
+import com.qs.serve.common.exception.Assert;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.common.util.CopierUtil;
+import com.qs.serve.framework.base.util.CollectionUtil;
+import com.qs.serve.common.utils.CopierUtil;
 import com.qs.serve.modules.bms.entity.BmsRegion;
 import com.qs.serve.modules.bms.entity.BmsRegion2;
 import com.qs.serve.modules.bms.service.BmsRegion2Service;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetApplyOperationServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetApplyOperationServiceImpl.java
index 8837bba..b104e8b 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetApplyOperationServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetApplyOperationServiceImpl.java
@@ -1,9 +1,9 @@
 package com.qs.serve.modules.tbs.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.framework.manager.AsyncManager;
-import com.qs.serve.common.model.enums.BudgetLogOptFlag;
-import com.qs.serve.common.util.Assert;
+import com.qs.serve.framework.base.framework.manager.AsyncManager;
+import com.qs.serve.common.enums.BudgetLogOptFlag;
+import com.qs.serve.common.exception.Assert;
 import com.qs.serve.modules.seeyon.service.SeeYonOperationService;
 import com.qs.serve.modules.sync.AsyncFactory;
 import com.qs.serve.modules.sys.entity.SysUser;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchOperationServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchOperationServiceImpl.java
index 224657f..ddf3d1b 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchOperationServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchOperationServiceImpl.java
@@ -1,7 +1,7 @@
 package com.qs.serve.modules.tbs.service.impl;
 
-import com.qs.serve.common.framework.manager.AsyncManager;
-import com.qs.serve.common.util.Assert;
+import com.qs.serve.framework.base.framework.manager.AsyncManager;
+import com.qs.serve.common.exception.Assert;
 import com.qs.serve.modules.seeyon.service.SeeYonOperationService;
 import com.qs.serve.modules.sync.AsyncFactory;
 import com.qs.serve.modules.tbs.common.TbsCommonCheckState;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchServiceImpl.java
index 7b6a768..e6547f4 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetBatchServiceImpl.java
@@ -3,11 +3,13 @@ package com.qs.serve.modules.tbs.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.config.properties.ProjectProperties;
-import com.qs.serve.common.framework.manager.AsyncManager;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.*;
-import com.qs.serve.common.util.model.DateFormatString;
+import com.qs.serve.framework.base.config.properties.ProjectProperties;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.framework.manager.AsyncManager;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.framework.base.util.model.DateFormatString;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bms.entity.BmsSubject;
 import com.qs.serve.modules.bms.service.BmsSubjectService;
 import com.qs.serve.modules.goods.entity.GoodsCategory;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeOperationServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeOperationServiceImpl.java
index 4959832..d2d40f8 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeOperationServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeOperationServiceImpl.java
@@ -1,9 +1,9 @@
 package com.qs.serve.modules.tbs.service.impl;
 
-import com.qs.serve.common.model.enums.BudgetLogOptFlag;
-import com.qs.serve.common.util.Assert;
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.enums.BudgetLogOptFlag;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.util.CollectionUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.seeyon.service.SeeYonOperationService;
 import com.qs.serve.modules.sync.AsyncFactory;
 import com.qs.serve.modules.sys.entity.SysUser;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeServiceImpl.java
index 39d0c45..b544354 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetChangeServiceImpl.java
@@ -2,10 +2,12 @@ package com.qs.serve.modules.tbs.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.config.properties.ProjectProperties;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.*;
-import com.qs.serve.common.util.model.DateFormatString;
+import com.qs.serve.framework.base.config.properties.ProjectProperties;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.framework.base.util.model.DateFormatString;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.seeyon.entity.BaseCreateCallbackBo;
 import com.qs.serve.modules.seeyon.entity.BaseCreateProcessBo;
 import com.qs.serve.modules.seeyon.service.SeeYonRequestService;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetCostItemServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetCostItemServiceImpl.java
index 079695d..bc07f60 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetCostItemServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetCostItemServiceImpl.java
@@ -2,7 +2,7 @@ package com.qs.serve.modules.tbs.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.util.CollectionUtil;
+import com.qs.serve.framework.base.util.CollectionUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetLogServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetLogServiceImpl.java
index 8417a52..905f26e 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetLogServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetLogServiceImpl.java
@@ -1,22 +1,13 @@
 package com.qs.serve.modules.tbs.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.model.enums.BudgetLogOptFlag;
-import com.qs.serve.common.util.Assert;
-import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.tbs.entity.*;
-import com.qs.serve.modules.tzc.entity.TzcPolicy;
-import com.qs.serve.modules.tzc.entity.TzcPolicyItem;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.jetbrains.annotations.NotNull;
-import org.omg.CORBA.DynAnyPackage.Invalid;
 import org.springframework.stereotype.Service;
 import com.qs.serve.modules.tbs.service.TbsBudgetLogService;
 import com.qs.serve.modules.tbs.mapper.TbsBudgetLogMapper;
 
-import java.math.BigDecimal;
-
 /**
  * 预算日志 服务实现类
  * @author YenHex
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetManagerServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetManagerServiceImpl.java
index 87047da..1df2e9f 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetManagerServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetManagerServiceImpl.java
@@ -3,11 +3,10 @@ package com.qs.serve.modules.tbs.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.qs.serve.common.util.CollectionUtil;
+import com.qs.serve.framework.base.util.CollectionUtil;
 import com.qs.serve.modules.tbs.entity.*;
 import com.qs.serve.modules.tbs.entity.vo.TbsBudgetMatchMsgVo;
 import com.qs.serve.modules.tbs.mapper.*;
-import com.qs.serve.modules.tbs.service.TbsActivityCenterGoodsService;
 import com.qs.serve.modules.tbs.service.TbsBudgetManagerService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java
index f1514f7..fc1a7d8 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java
@@ -3,13 +3,15 @@ package com.qs.serve.modules.tbs.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.config.properties.ProjectProperties;
-import com.qs.serve.common.framework.manager.AsyncManager;
-import com.qs.serve.common.framework.redis.RedisService;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BudgetLogOptFlag;
-import com.qs.serve.common.util.*;
-import com.qs.serve.common.util.model.DateFormatString;
+import com.qs.serve.framework.base.config.properties.ProjectProperties;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.framework.manager.AsyncManager;
+import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BudgetLogOptFlag;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.framework.base.util.model.DateFormatString;
+import com.qs.serve.common.utils.CopierUtil;
 import com.qs.serve.modules.bms.entity.BmsSubject;
 import com.qs.serve.modules.bms.service.BmsSubjectService;
 import com.qs.serve.modules.goods.entity.GoodsCategory;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java
index 035e5a1..11c0de3 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java
@@ -2,11 +2,13 @@ package com.qs.serve.modules.tbs.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.qs.serve.common.framework.manager.AsyncManager;
-import com.qs.serve.common.model.enums.BudgetLogOptFlag;
-import com.qs.serve.common.model.consts.BudgetLogRollbackFlag;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.framework.manager.AsyncManager;
+import com.qs.serve.common.enums.BudgetLogOptFlag;
+import com.qs.serve.framework.base.model.consts.BudgetLogRollbackFlag;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bir.consts.BirActivityCenterGoodsUtil;
 import com.qs.serve.modules.data.entity.DataAffairCommit;
 import com.qs.serve.modules.data.mapper.DataAffairCommitMapper;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java
index 6c3ac08..f451e27 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java
@@ -2,10 +2,12 @@ package com.qs.serve.modules.tbs.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.qs.serve.common.framework.redis.RedisService;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BudgetLogOptFlag;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BudgetLogOptFlag;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.CopierUtil;
 import com.qs.serve.modules.bir.consts.BirActivityCenterGoodsUtil;
 import com.qs.serve.modules.bms.entity.BmsRegion;
 import com.qs.serve.modules.bms.entity.BmsSubject;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java
index 5fdbc68..90b97c7 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java
@@ -6,21 +6,24 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.config.properties.ProjectApisProperties;
-import com.qs.serve.common.config.properties.ProjectProperties;
-import com.qs.serve.common.framework.manager.AsyncManager;
-import com.qs.serve.common.framework.redis.RedisService;
-import com.qs.serve.common.model.enums.BudgetLogOptFlag;
-import com.qs.serve.common.model.consts.BudgetLogRollbackFlag;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.MonthValues;
-import com.qs.serve.common.model.oa.OaFormMainProcess;
-import com.qs.serve.common.model.oa.OaUploadFile;
+import com.qs.serve.framework.base.config.properties.ProjectApisProperties;
+import com.qs.serve.framework.base.config.properties.ProjectProperties;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.framework.manager.AsyncManager;
+import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.common.enums.BudgetLogOptFlag;
+import com.qs.serve.framework.base.model.consts.BudgetLogRollbackFlag;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.MonthValues;
+import com.qs.serve.framework.base.model.oa.OaFormMainProcess;
+import com.qs.serve.framework.base.model.oa.OaUploadFile;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.sync.AsyncFactory;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
 import com.qs.serve.modules.tag.util.TagFiledUtil;
-import com.qs.serve.common.util.*;
-import com.qs.serve.common.util.model.DateFormatString;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.framework.base.util.model.DateFormatString;
 import com.qs.serve.modules.bir.entity.dto.BirRoiCostDTO;
 import com.qs.serve.modules.bir.entity.vo.BirRoiCostItemVo;
 import com.qs.serve.modules.bir.entity.vo.YtdQtdToOAVo;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostContractServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostContractServiceImpl.java
index f9d465d..0d461b1 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostContractServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostContractServiceImpl.java
@@ -2,7 +2,7 @@ package com.qs.serve.modules.tbs.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.util.CollectionUtil;
+import com.qs.serve.framework.base.util.CollectionUtil;
 import com.qs.serve.modules.sys.entity.SysAttach;
 import com.qs.serve.modules.sys.service.SysAttachService;
 import lombok.AllArgsConstructor;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostTodoOperationServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostTodoOperationServiceImpl.java
index 6bb98c0..93da4a5 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostTodoOperationServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostTodoOperationServiceImpl.java
@@ -5,10 +5,12 @@ import java.util.List;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.config.properties.ProjectProperties;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.*;
-import com.qs.serve.common.util.model.DateFormatString;
+import com.qs.serve.framework.base.config.properties.ProjectProperties;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.framework.base.util.model.DateFormatString;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.data.service.DataAffairCommitService;
 import com.qs.serve.modules.seeyon.entity.BaseCreateCallbackBo;
 import com.qs.serve.modules.seeyon.entity.BaseCreateProcessBo;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsDealErrorApplication.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsDealErrorApplication.java
index 810eb63..cfcd1f5 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsDealErrorApplication.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsDealErrorApplication.java
@@ -2,7 +2,7 @@ package com.qs.serve.modules.tbs.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.qs.serve.common.util.JsonUtil;
+import com.qs.serve.framework.base.util.JsonUtil;
 import com.qs.serve.modules.sys.entity.SysSyncLog;
 import com.qs.serve.modules.sys.mapper.SysSyncLogMapper;
 import com.qs.serve.modules.tbs.entity.*;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsScheduleItemBudgetServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsScheduleItemBudgetServiceImpl.java
index 921dfa6..f5d8a8a 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsScheduleItemBudgetServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsScheduleItemBudgetServiceImpl.java
@@ -3,12 +3,10 @@ package com.qs.serve.modules.tbs.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
-import com.qs.serve.common.model.enums.BudgetLogOptFlag;
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.common.enums.BudgetLogOptFlag;
+import com.qs.serve.framework.base.util.CollectionUtil;
 import com.qs.serve.modules.tbs.entity.TbsBudget;
 import com.qs.serve.modules.tbs.entity.TbsBudgetCondition;
-import com.qs.serve.modules.tbs.entity.TbsBudgetLog;
 import com.qs.serve.modules.tbs.entity.dto.*;
 import com.qs.serve.modules.tbs.entity.so.TbsScheduleItemSearch;
 import com.qs.serve.modules.tbs.mapper.*;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/PortalBmsController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/PortalBmsController.java
index 972de8f..770d1ba 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/PortalBmsController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/PortalBmsController.java
@@ -1,19 +1,15 @@
 package com.qs.serve.modules.third;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.TreeUtil;
+import com.qs.serve.common.utils.CopierUtil;
 import com.qs.serve.modules.bms.entity.BmsCostCenter;
 import com.qs.serve.modules.bms.entity.BmsRegion;
-import com.qs.serve.modules.bms.entity.vo.BmsCostCenterTreeVo;
 import com.qs.serve.modules.bms.entity.vo.BmsCostCenterVo;
 import com.qs.serve.modules.bms.entity.vo.BmsRegionTreeVo;
 import com.qs.serve.modules.bms.service.BmsCostCenterService;
 import com.qs.serve.modules.bms.service.BmsRegionService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/PortalController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/PortalController.java
index 31d2481..6468a76 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/PortalController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/PortalController.java
@@ -1,17 +1,11 @@
 package com.qs.serve.modules.third;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.google.gson.JsonArray;
-import com.qs.serve.common.model.annotation.LimitSubmit;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.util.JsonUtil;
-import com.qs.serve.common.util.StringUtils;
-import com.qs.serve.modules.seeyon.service.XiaoLuTonService;
+import com.qs.serve.common.annotation.LimitSubmit;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.sys.service.SysUserLoginService;
-import com.qs.serve.modules.third.entity.AptPolicyPayment;
 import com.qs.serve.modules.third.entity.param.SSOLoginParam;
 import com.qs.serve.modules.vtb.service.VtbVerificationService;
 import lombok.AllArgsConstructor;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/PortalFlowController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/PortalFlowController.java
index 16d265b..86a22b4 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/PortalFlowController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/PortalFlowController.java
@@ -1,6 +1,6 @@
 package com.qs.serve.modules.third;
 
-import com.qs.serve.common.model.dto.R;
+import com.qs.serve.framework.base.model.R;
 import com.qs.serve.modules.oms.service.OmsOrderOptionsService;
 import com.qs.serve.modules.seeyon.service.SeeYonRequestService;
 import com.qs.serve.modules.sys.entity.SysSyncLog;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/PortalFormPushController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/PortalFormPushController.java
index 9be0295..172c778 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/PortalFormPushController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/PortalFormPushController.java
@@ -1,14 +1,8 @@
 package com.qs.serve.modules.third;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.utils.CopierUtil;
 import com.qs.serve.modules.wx.entity.WxFormPushType;
 import com.qs.serve.modules.wx.entity.WxFormPushUser;
 import com.qs.serve.modules.wx.entity.WxUser;
@@ -18,7 +12,6 @@ import com.qs.serve.modules.wx.entity.vo.WxPushResultVo;
 import com.qs.serve.modules.wx.service.*;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import com.qs.serve.modules.wx.entity.WxFormPush;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/PortalGoodsController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/PortalGoodsController.java
index 371de2a..940ee71 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/PortalGoodsController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/PortalGoodsController.java
@@ -2,14 +2,11 @@ package com.qs.serve.modules.third;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.Assert;
 import com.qs.serve.modules.goods.entity.GoodsSku;
 import com.qs.serve.modules.goods.entity.GoodsSpu;
 import com.qs.serve.modules.goods.service.GoodsSkuService;
 import com.qs.serve.modules.goods.service.GoodsSpuService;
 import com.qs.serve.modules.oms.entity.dto.OmsSpuToSkuKey;
-import com.qs.serve.modules.oms.entity.dto.OmsSpuToSkuKey2;
 import com.qs.serve.modules.sys.entity.SysDictData;
 import com.qs.serve.modules.sys.service.SysDictDataService;
 import com.qs.serve.modules.third.entity.GoodsToSkuParam;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/PortalOfCostController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/PortalOfCostController.java
index 08fbe90..a632a66 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/PortalOfCostController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/PortalOfCostController.java
@@ -1,8 +1,8 @@
 package com.qs.serve.modules.third;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.JsonUtil;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.util.JsonUtil;
 import com.qs.serve.modules.bir.consts.BirActivityCenterGoodsUtil;
 import com.qs.serve.modules.pay.entity.bo.PayPaymentBo;
 import com.qs.serve.modules.sys.entity.SysSyncLog;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/PortalOfCostTestController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/PortalOfCostTestController.java
index 7e25b1a..770d347 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/PortalOfCostTestController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/PortalOfCostTestController.java
@@ -1,41 +1,30 @@
 package com.qs.serve.modules.third;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.Assert;
-import com.qs.serve.common.util.JsonUtil;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.util.JsonUtil;
 import com.qs.serve.modules.bms.entity.BmsSubject;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.service.BmsSubjectService;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
-import com.qs.serve.modules.pay.entity.bo.PayPaymentBo;
 import com.qs.serve.modules.sys.entity.SysSyncLog;
 import com.qs.serve.modules.sys.service.SysSyncLogService;
 import com.qs.serve.modules.tbs.entity.TbsActivity;
 import com.qs.serve.modules.tbs.service.TbsActivityService;
-import com.qs.serve.modules.third.entity.ProcessCreateContractCheckBo;
 import com.qs.serve.modules.third.entity.ProcessCreateCostApplyBo;
-import com.qs.serve.modules.third.entity.ProcessCreatePolicyCostBo;
-import com.qs.serve.modules.third.entity.ProcessReleaseContractBo;
 import com.qs.serve.modules.third.service.PortalOfCostApplication;
 import com.qs.serve.modules.third.service.PortalOfCostPartApplication;
 import com.qs.serve.modules.third.util.ThirtyVerificationUtil;
-import com.qs.serve.modules.vtb.common.VtbVerificationState;
 import com.qs.serve.modules.vtb.entity.VtbVerification;
-import com.qs.serve.modules.vtb.entity.VtbVerificationSubject;
-import com.qs.serve.modules.vtb.entity.dto.VtbVerificationCodesDTO;
 import com.qs.serve.modules.vtb.mapper.VtbVerificationMapper;
 import com.qs.serve.modules.vtb.service.VtbVerificationService;
 import com.qs.serve.modules.vtb.service.VtbVerificationSubjectService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
 import java.util.Arrays;
 import java.util.List;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/PortalSupplierController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/PortalSupplierController.java
index 853a872..42eceb0 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/PortalSupplierController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/PortalSupplierController.java
@@ -1,45 +1,14 @@
 package com.qs.serve.modules.third;
 
-import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.pagehelper.PageHelper;
-import com.qs.serve.common.framework.redis.RedisService;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.consts.RedisCacheKeys;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.*;
-import com.qs.serve.modules.bms.controller.my.BmsSupplierMyController;
-import com.qs.serve.modules.bms.entity.BmsRegion;
-import com.qs.serve.modules.bms.entity.BmsRegion2;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.CopierUtil;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
-import com.qs.serve.modules.bms.entity.BmsSupplierComRegion;
 import com.qs.serve.modules.bms.entity.bo.BmsSupplierBo;
-import com.qs.serve.modules.bms.entity.bo.BmsSupplierExcelBo;
-import com.qs.serve.modules.bms.entity.bo.BmsSupplierParentBo;
-import com.qs.serve.modules.bms.entity.vo.BmsSupplierTreeVo;
-import com.qs.serve.modules.bms.mapper.BmsSupplierComRegionMapper;
-import com.qs.serve.modules.bms.mapper.BmsSupplierMapper;
 import com.qs.serve.modules.bms.service.*;
-import com.qs.serve.modules.his.entity.HisUserSupplier;
-import com.qs.serve.modules.his.service.HisUserSupplierService;
 import com.qs.serve.modules.sys.entity.SysSyncLog;
-import com.qs.serve.modules.sys.entity.SysUser;
-import com.qs.serve.modules.sys.entity.bo.SysRelateSuppliersParam;
-import com.qs.serve.modules.sys.entity.bo.SysRelateSuppliersParam2;
-import com.qs.serve.modules.sys.entity.dto.SysUserSimpleVo;
-import com.qs.serve.modules.sys.entity.dto.SysUserVo;
-import com.qs.serve.modules.sys.service.SysAttachService;
-import com.qs.serve.modules.sys.service.SysPostUserService;
 import com.qs.serve.modules.sys.service.SysSyncLogService;
-import com.qs.serve.modules.sys.service.SysUserService;
-import com.qs.serve.modules.tbs.common.TbsCenterType;
-import com.qs.serve.modules.tbs.entity.TbsBudget;
-import com.qs.serve.modules.tbs.service.TbsBudgetService;
-import com.qs.serve.modules.third.entity.ProcessCreateCostApplyBo;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -47,9 +16,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
-import java.time.LocalDateTime;
-import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * 基础档案 客户
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/ThirdTokenUtil.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/ThirdTokenUtil.java
index 8ccb22c..c4984f3 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/ThirdTokenUtil.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/ThirdTokenUtil.java
@@ -1,8 +1,8 @@
 package com.qs.serve.modules.third;
 
 import cn.hutool.crypto.SecureUtil;
-import com.qs.serve.common.config.DevEnvironmentConfig;
-import com.qs.serve.common.util.Assert;
+import com.qs.serve.framework.base.config.DevEnvironmentConfig;
+import com.qs.serve.common.exception.Assert;
 import com.qs.serve.modules.third.consts.ThirtyConst;
 import lombok.extern.slf4j.Slf4j;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/service/PortalOfCost2Application.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/service/PortalOfCost2Application.java
index 26855a4..abf347a 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/service/PortalOfCost2Application.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/service/PortalOfCost2Application.java
@@ -1,13 +1,12 @@
 package com.qs.serve.modules.third.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.qs.serve.common.config.properties.ProjectApisProperties;
-import com.qs.serve.common.model.consts.ResultFlag;
-import com.qs.serve.common.model.consts.SysConfigKey;
-import com.qs.serve.common.model.enums.BudgetLogOptFlag;
-import com.qs.serve.common.util.*;
+import com.qs.serve.framework.base.config.properties.ProjectApisProperties;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.model.ResultFlag;
+import com.qs.serve.common.enums.BudgetLogOptFlag;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bms.entity.*;
 import com.qs.serve.modules.bms.service.*;
 import com.qs.serve.modules.goods.entity.GoodsCategory;
@@ -17,18 +16,11 @@ import com.qs.serve.modules.goods.entity.dto.TbsCenterDto;
 import com.qs.serve.modules.goods.service.GoodsCategoryService;
 import com.qs.serve.modules.goods.service.GoodsSkuService;
 import com.qs.serve.modules.goods.service.GoodsSpuService;
-import com.qs.serve.modules.pay.common.PaymentType;
 import com.qs.serve.modules.pay.entity.PayPayment;
-import com.qs.serve.modules.pay.entity.PayPaymentItem;
-import com.qs.serve.modules.pay.service.PayPaymentItemService;
 import com.qs.serve.modules.pay.service.PayPaymentService;
-import com.qs.serve.modules.seeyon.service.XiaoLuTonService;
-import com.qs.serve.modules.sys.entity.SysConfig;
 import com.qs.serve.modules.sys.entity.SysSyncLog;
 import com.qs.serve.modules.sys.entity.SysUser;
-import com.qs.serve.modules.sys.mapper.SysTableTempMapper;
 import com.qs.serve.modules.sys.mapper.SysUserCodeMathMapper;
-import com.qs.serve.modules.sys.service.SysConfigService;
 import com.qs.serve.modules.sys.service.SysSyncLogService;
 import com.qs.serve.modules.sys.service.SysUserService;
 import com.qs.serve.modules.tbs.common.TbsActivityState;
@@ -36,24 +28,12 @@ import com.qs.serve.modules.tbs.common.TbsCostApplyState;
 import com.qs.serve.modules.tbs.common.util.TbsBudgetLogBuildUtil;
 import com.qs.serve.modules.tbs.entity.*;
 import com.qs.serve.modules.tbs.entity.dto.TbsBudgetCostResult;
-import com.qs.serve.modules.tbs.entity.so.TbsScheduleItemSearch;
-import com.qs.serve.modules.tbs.mapper.TbsBudgetMapper;
-import com.qs.serve.modules.tbs.mapper.TbsCostApplyMapper;
 import com.qs.serve.modules.tbs.service.*;
 import com.qs.serve.modules.third.entity.*;
 import com.qs.serve.modules.third.util.ThirtyVerificationUtil;
-import com.qs.serve.modules.tzc.common.TzPolicyItemStatus;
-import com.qs.serve.modules.tzc.entity.TzcPolicyItem;
-import com.qs.serve.modules.tzc.entity.TzcPolicyItemLog;
-import com.qs.serve.modules.tzc.mapper.TzcPolicyItemMapper;
-import com.qs.serve.modules.tzc.service.TzcPolicyGoodsSyncService;
-import com.qs.serve.modules.tzc.service.TzcPolicyItemLogService;
-import com.qs.serve.modules.tzc.service.TzcPolicyItemService;
 import com.qs.serve.modules.vtb.common.VtbVerificationState;
 import com.qs.serve.modules.vtb.entity.VtbVerification;
 import com.qs.serve.modules.vtb.entity.VtbVerificationSubject;
-import com.qs.serve.modules.vtb.mapper.VtbVerificationSubjectMapper;
-import com.qs.serve.modules.vtb.service.VtbFundFlowService;
 import com.qs.serve.modules.vtb.service.VtbVerificationService;
 import com.qs.serve.modules.vtb.service.VtbVerificationSubjectService;
 import lombok.AllArgsConstructor;
@@ -121,7 +101,8 @@ public class PortalOfCost2Application {
                 user = userService.getByAccount(newUcode);
             }
         }
-        if(user==null){Assert.throwEx("用户不存在，请重新编辑");}
+        if(user==null){
+            Assert.throwEx("用户不存在，请重新编辑");}
         BmsSupplier supplier = supplierService.getByCode(createBo.getCustomerCode(),createBo.getCustomerBelong());
         if(supplier==null){Assert.throwEx("客户不存在，请重新编辑");}
         BmsSubject subject = subjectService.getByCode(createBo.getSubjectCode());
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java
index ab1e96e..8112b84 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java
@@ -1,14 +1,16 @@
 package com.qs.serve.modules.third.service;
 
-import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.qs.serve.common.config.properties.ProjectApisProperties;
-import com.qs.serve.common.model.consts.SysConfigKey;
-import com.qs.serve.common.model.enums.BudgetLogOptFlag;
-import com.qs.serve.common.model.consts.ResultFlag;
-import com.qs.serve.common.util.*;
+import com.qs.serve.framework.base.config.properties.ProjectApisProperties;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.model.consts.SysConfigKey;
+import com.qs.serve.common.enums.BudgetLogOptFlag;
+import com.qs.serve.framework.base.model.ResultFlag;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bir.consts.BirActivityCenterGoodsUtil;
 import com.qs.serve.modules.bms.entity.*;
 import com.qs.serve.modules.bms.service.*;
@@ -23,12 +25,9 @@ import com.qs.serve.modules.pay.entity.PayPayment;
 import com.qs.serve.modules.pay.entity.PayPaymentItem;
 import com.qs.serve.modules.pay.service.PayPaymentItemService;
 import com.qs.serve.modules.pay.service.PayPaymentService;
-import com.qs.serve.modules.seeyon.entity.XltApticlaim;
-import com.qs.serve.modules.seeyon.entity.XltPaymentRecord;
 import com.qs.serve.modules.seeyon.service.XiaoLuTonService;
 import com.qs.serve.modules.sys.entity.SysConfig;
 import com.qs.serve.modules.sys.entity.SysSyncLog;
-import com.qs.serve.modules.sys.entity.SysTableTemp;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.sys.mapper.SysTableTempMapper;
 import com.qs.serve.modules.sys.mapper.SysUserCodeMathMapper;
@@ -40,23 +39,19 @@ import com.qs.serve.modules.tbs.common.TbsCostApplyState;
 import com.qs.serve.modules.tbs.common.util.TbsBudgetLogBuildUtil;
 import com.qs.serve.modules.tbs.entity.*;
 import com.qs.serve.modules.tbs.entity.dto.TbsBudgetCostResult;
-import com.qs.serve.modules.tbs.mapper.TbsActivitySubjectMapper;
 import com.qs.serve.modules.tbs.mapper.TbsBudgetMapper;
 import com.qs.serve.modules.tbs.mapper.TbsCostApplyMapper;
 import com.qs.serve.modules.tbs.service.*;
 import com.qs.serve.modules.third.entity.*;
 import com.qs.serve.modules.third.util.ThirtyVerificationUtil;
 import com.qs.serve.modules.tzc.common.TzPolicyItemStatus;
-import com.qs.serve.modules.tzc.entity.TzcPolicyGoodsSync;
 import com.qs.serve.modules.tzc.entity.TzcPolicyItem;
 import com.qs.serve.modules.tzc.entity.TzcPolicyItemLog;
 import com.qs.serve.modules.tzc.mapper.TzcPolicyItemMapper;
 import com.qs.serve.modules.tzc.service.TzcPolicyGoodsSyncService;
 import com.qs.serve.modules.tzc.service.TzcPolicyItemLogService;
 import com.qs.serve.modules.tzc.service.TzcPolicyItemService;
-import com.qs.serve.modules.vtb.common.VtbFundFlowType;
 import com.qs.serve.modules.vtb.common.VtbVerificationState;
-import com.qs.serve.modules.vtb.entity.VtbFundFlow;
 import com.qs.serve.modules.vtb.entity.VtbVerification;
 import com.qs.serve.modules.vtb.entity.VtbVerificationSubject;
 import com.qs.serve.modules.vtb.mapper.VtbVerificationSubjectMapper;
@@ -66,12 +61,10 @@ import com.qs.serve.modules.vtb.service.VtbVerificationSubjectService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.RoundingMode;
-import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.math.BigDecimal;
 import java.time.LocalDate;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/service/PortalOfCostPartApplication.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/service/PortalOfCostPartApplication.java
index f086f32..08d48d5 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/service/PortalOfCostPartApplication.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/service/PortalOfCostPartApplication.java
@@ -1,74 +1,33 @@
 package com.qs.serve.modules.third.service;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.qs.serve.common.config.properties.ProjectApisProperties;
-import com.qs.serve.common.model.consts.ResultFlag;
-import com.qs.serve.common.model.enums.BudgetLogOptFlag;
-import com.qs.serve.common.util.*;
-import com.qs.serve.modules.bms.entity.BmsCostCenter;
-import com.qs.serve.modules.bms.entity.BmsRegion;
-import com.qs.serve.modules.bms.entity.BmsSubject;
-import com.qs.serve.modules.bms.entity.BmsSupplier;
+import com.qs.serve.framework.base.config.properties.ProjectApisProperties;
 import com.qs.serve.modules.bms.service.BmsCostCenterService;
 import com.qs.serve.modules.bms.service.BmsRegionService;
 import com.qs.serve.modules.bms.service.BmsSubjectService;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
-import com.qs.serve.modules.goods.entity.GoodsCategory;
-import com.qs.serve.modules.goods.entity.GoodsSku;
-import com.qs.serve.modules.goods.entity.GoodsSpu;
 import com.qs.serve.modules.goods.service.GoodsCategoryService;
 import com.qs.serve.modules.goods.service.GoodsSkuService;
 import com.qs.serve.modules.goods.service.GoodsSpuService;
-import com.qs.serve.modules.pay.common.PaymentType;
-import com.qs.serve.modules.pay.entity.PayPayment;
-import com.qs.serve.modules.pay.entity.PayPaymentItem;
 import com.qs.serve.modules.pay.entity.bo.PayPaymentBo;
 import com.qs.serve.modules.pay.service.PayPaymentItemService;
 import com.qs.serve.modules.pay.service.PayPaymentService;
 import com.qs.serve.modules.seeyon.service.XiaoLuTonService;
-import com.qs.serve.modules.sys.entity.SysSyncLog;
-import com.qs.serve.modules.sys.entity.SysTableTemp;
-import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.sys.mapper.SysTableTempMapper;
 import com.qs.serve.modules.sys.mapper.SysUserCodeMathMapper;
 import com.qs.serve.modules.sys.service.SysSyncLogService;
 import com.qs.serve.modules.sys.service.SysUserService;
-import com.qs.serve.modules.tbs.common.TbsActivityState;
-import com.qs.serve.modules.tbs.common.TbsCostApplyState;
-import com.qs.serve.modules.tbs.common.util.TbsBudgetLogBuildUtil;
-import com.qs.serve.modules.tbs.entity.*;
-import com.qs.serve.modules.tbs.entity.dto.TbsBudgetCostResult;
 import com.qs.serve.modules.tbs.mapper.TbsBudgetMapper;
 import com.qs.serve.modules.tbs.service.*;
-import com.qs.serve.modules.third.entity.*;
-import com.qs.serve.modules.third.util.ThirtyVerificationUtil;
-import com.qs.serve.modules.tzc.common.TzPolicyItemStatus;
-import com.qs.serve.modules.tzc.entity.TzcPolicyItem;
-import com.qs.serve.modules.tzc.entity.TzcPolicyItemLog;
 import com.qs.serve.modules.tzc.mapper.TzcPolicyItemMapper;
 import com.qs.serve.modules.tzc.service.TzcPolicyGoodsSyncService;
 import com.qs.serve.modules.tzc.service.TzcPolicyItemLogService;
 import com.qs.serve.modules.tzc.service.TzcPolicyItemService;
-import com.qs.serve.modules.vtb.common.VtbVerificationState;
-import com.qs.serve.modules.vtb.entity.VtbVerification;
-import com.qs.serve.modules.vtb.entity.VtbVerificationSubject;
-import com.qs.serve.modules.vtb.mapper.VtbVerificationSubjectMapper;
 import com.qs.serve.modules.vtb.service.VtbFundFlowService;
 import com.qs.serve.modules.vtb.service.VtbVerificationService;
 import com.qs.serve.modules.vtb.service.VtbVerificationSubjectService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * @author YenHex
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/util/ThirtyVerificationUtil.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/util/ThirtyVerificationUtil.java
index c79f2f2..c6afc2b 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/util/ThirtyVerificationUtil.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/util/ThirtyVerificationUtil.java
@@ -1,8 +1,8 @@
 package com.qs.serve.modules.third.util;
 
-import com.qs.serve.common.util.HttpUtil;
-import com.qs.serve.common.util.IdUtil;
-import com.qs.serve.common.util.JsonUtil;
+import com.qs.serve.framework.base.util.HttpUtil;
+import com.qs.serve.framework.base.util.IdUtil;
+import com.qs.serve.framework.base.util.JsonUtil;
 import com.qs.serve.modules.bms.entity.BmsSubject;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.sys.entity.SysSyncLog;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/common/dto/PolicySortWrapper.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/common/dto/PolicySortWrapper.java
index 90bdf61..7b8bd94 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/common/dto/PolicySortWrapper.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/common/dto/PolicySortWrapper.java
@@ -1,13 +1,12 @@
 package com.qs.serve.modules.tzc.common.dto;
 
-import com.qs.serve.common.util.CollectionUtil;
+import com.qs.serve.framework.base.util.CollectionUtil;
 import com.qs.serve.modules.tbs.entity.TbsBudget;
 import com.qs.serve.modules.tbs.entity.TbsBudgetCondition;
 import com.qs.serve.modules.tbs.entity.TbsScheduleItemBudget;
 import lombok.Data;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * 用于排序
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/common/util/PolicySortWrapperUtil.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/common/util/PolicySortWrapperUtil.java
index 999beec..4704709 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/common/util/PolicySortWrapperUtil.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/common/util/PolicySortWrapperUtil.java
@@ -1,7 +1,7 @@
 package com.qs.serve.modules.tzc.common.util;
 
-import com.qs.serve.common.util.Assert;
-import com.qs.serve.common.util.CollectionUtil;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.util.CollectionUtil;
 import com.qs.serve.modules.tbs.entity.TbsBudgetCondition;
 import com.qs.serve.modules.tbs.entity.TbsScheduleItemBudget;
 import com.qs.serve.modules.tzc.common.dto.PolicySortWrapper;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java
index fb7acdb..b8ed6b9 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java
@@ -1,15 +1,15 @@
 package com.qs.serve.modules.tzc.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.LimitSubmit;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
+import com.qs.serve.common.annotation.LimitSubmit;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bms.entity.BmsRegion2;
 import com.qs.serve.modules.bms.service.BmsRegion2Service;
 import com.qs.serve.modules.seeyon.entity.CtpAffairQo;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyItemController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyItemController.java
index 0c98ddb..b68e3f7 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyItemController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyItemController.java
@@ -1,12 +1,15 @@
 package com.qs.serve.modules.tzc.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
 import com.qs.serve.modules.sys.entity.SysAttach;
 import com.qs.serve.modules.sys.entity.SysUser;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyTestController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyTestController.java
index 0e20175..eeabafb 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyTestController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyTestController.java
@@ -1,9 +1,9 @@
 package com.qs.serve.modules.tzc.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BudgetLogOptFlag;
-import com.qs.serve.common.util.*;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BudgetLogOptFlag;
+import com.qs.serve.framework.base.util.*;
 import com.qs.serve.modules.bms.service.BmsRegion2Service;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
 import com.qs.serve.modules.sys.entity.SysTableTemp;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/entity/TzcPolicy.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/entity/TzcPolicy.java
index cbd6dcd..d8cffeb 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/entity/TzcPolicy.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/entity/TzcPolicy.java
@@ -1,6 +1,5 @@
 package com.qs.serve.modules.tzc.entity;
 
-import java.time.LocalDate;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -10,7 +9,6 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.qs.serve.common.model.dto.R;
 import com.qs.serve.modules.tzc.common.TzcPolicyStatus;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/entity/TzcPolicyItem.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/entity/TzcPolicyItem.java
index e439318..61eb3b0 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/entity/TzcPolicyItem.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/entity/TzcPolicyItem.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
+import com.qs.serve.mbp.handler.SplitStringTypeHandler;
 import com.qs.serve.modules.tbs.entity.TbsBudgetCondition;
 import com.qs.serve.modules.tbs.entity.TbsScheduleItemBudget;
 import lombok.Data;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcPolicyItemBo.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcPolicyItemBo.java
index 9f38333..87817fa 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcPolicyItemBo.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/entity/bo/TzcPolicyItemBo.java
@@ -3,15 +3,8 @@ package com.qs.serve.modules.tzc.entity.bo;
 import java.time.LocalDate;
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
 import lombok.Data;
-import org.apache.ibatis.type.JdbcType;
 import org.hibernate.validator.constraints.Length;
 import org.springframework.format.annotation.DateTimeFormat;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/TzcPolicyItemService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/TzcPolicyItemService.java
index 8764144..7664488 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/TzcPolicyItemService.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/TzcPolicyItemService.java
@@ -1,7 +1,7 @@
 package com.qs.serve.modules.tzc.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qs.serve.common.model.dto.R;
+import com.qs.serve.framework.base.model.R;
 import com.qs.serve.modules.tzc.entity.TzcPolicyItem;
 import com.qs.serve.modules.tzc.entity.bo.TzcPolicyItemBo;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/TzcPolicyService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/TzcPolicyService.java
index 5e5962b..42351a6 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/TzcPolicyService.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/TzcPolicyService.java
@@ -1,7 +1,7 @@
 package com.qs.serve.modules.tzc.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qs.serve.common.model.dto.R;
+import com.qs.serve.framework.base.model.R;
 import com.qs.serve.modules.tzc.entity.TzcPolicy;
 import com.qs.serve.modules.tzc.entity.bo.TzcPolicyBo;
 import java.util.List;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java
index 1c55abb..f610012 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java
@@ -1,16 +1,19 @@
 package com.qs.serve.modules.tzc.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.config.DevEnvironmentConfig;
-import com.qs.serve.common.config.properties.ProjectApisProperties;
-import com.qs.serve.common.config.properties.ProjectProperties;
-import com.qs.serve.common.framework.manager.AsyncManager;
-import com.qs.serve.common.framework.redis.RedisService;
-import com.qs.serve.common.model.consts.SysConfigKey;
-import com.qs.serve.common.model.enums.BudgetLogOptFlag;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.*;
-import com.qs.serve.common.util.model.DateFormatString;
+import com.qs.serve.framework.base.config.DevEnvironmentConfig;
+import com.qs.serve.framework.base.config.properties.ProjectApisProperties;
+import com.qs.serve.framework.base.config.properties.ProjectProperties;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.framework.manager.AsyncManager;
+import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.framework.base.model.consts.SysConfigKey;
+import com.qs.serve.common.enums.BudgetLogOptFlag;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.framework.base.util.model.DateFormatString;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.bms.entity.BmsRegion;
 import com.qs.serve.modules.bms.entity.BmsRegion2;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyGoodsServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyGoodsServiceImpl.java
index 3a9da50..335b5c1 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyGoodsServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyGoodsServiceImpl.java
@@ -2,15 +2,6 @@ package com.qs.serve.modules.tzc.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.Assert;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.modules.goods.service.GoodsApplicationService;
-import com.qs.serve.modules.tzc.entity.TzcPolicy;
-import com.qs.serve.modules.tzc.entity.TzcPolicyItem;
-import com.qs.serve.modules.tzc.entity.bo.TzcPolicyGoodsBo;
-import com.qs.serve.modules.tzc.mapper.TzcPolicyItemMapper;
-import com.qs.serve.modules.tzc.mapper.TzcPolicyMapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyItemServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyItemServiceImpl.java
index e7f09ae..794eba8 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyItemServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyItemServiceImpl.java
@@ -2,16 +2,15 @@ package com.qs.serve.modules.tzc.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.Assert;
-import com.qs.serve.common.util.CopierUtil;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.common.utils.CopierUtil;
 import com.qs.serve.modules.bms.entity.BmsSubject;
 import com.qs.serve.modules.bms.service.BmsSubjectService;
 import com.qs.serve.modules.goods.entity.dto.GoodsTargetInfo;
 import com.qs.serve.modules.goods.entity.dto.TbsCenterDto;
 import com.qs.serve.modules.goods.service.GoodsApplicationService;
 import com.qs.serve.modules.tbs.service.TbsCenterDtoService;
-import com.qs.serve.modules.tzc.common.TzcPolicyStatus;
 import com.qs.serve.modules.tzc.entity.TzcPolicy;
 import com.qs.serve.modules.tzc.entity.TzcPolicyGoods;
 import com.qs.serve.modules.tzc.entity.bo.TzcPolicyGoodsBo;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyOperationServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyOperationServiceImpl.java
index ed6835b..36ba864 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyOperationServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyOperationServiceImpl.java
@@ -1,11 +1,11 @@
 package com.qs.serve.modules.tzc.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.framework.manager.AsyncManager;
-import com.qs.serve.common.model.consts.BudgetLogRollbackFlag;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BudgetLogOptFlag;
-import com.qs.serve.common.util.Assert;
+import com.qs.serve.framework.base.framework.manager.AsyncManager;
+import com.qs.serve.framework.base.model.consts.BudgetLogRollbackFlag;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BudgetLogOptFlag;
+import com.qs.serve.common.exception.Assert;
 import com.qs.serve.modules.seeyon.service.SeeYonOperationService;
 import com.qs.serve.modules.sync.AsyncFactory;
 import com.qs.serve.modules.tbs.common.TbsSeeYonConst;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyServiceImpl.java
index 527d361..1846c78 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyServiceImpl.java
@@ -2,8 +2,8 @@ package com.qs.serve.modules.tzc.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.*;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.util.*;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/common/VerificationUtil.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/common/VerificationUtil.java
index 9c51026..c09eba0 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/common/VerificationUtil.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/common/VerificationUtil.java
@@ -1,6 +1,6 @@
 package com.qs.serve.modules.vtb.common;
 
-import com.qs.serve.common.util.Assert;
+import com.qs.serve.common.exception.Assert;
 import com.qs.serve.modules.tbs.common.TbsCostApplyState;
 import com.qs.serve.modules.tbs.entity.TbsCostApply;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationBatchController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationBatchController.java
index 4286716..8f3bb82 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationBatchController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationBatchController.java
@@ -1,13 +1,14 @@
 package com.qs.serve.modules.vtb.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.LimitSubmit;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.annotation.LimitSubmit;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.seeyon.entity.bo.CtpAddNodeParam;
 import com.qs.serve.modules.seeyon.service.SeeYonRequestService;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java
index f68c5ec..c0e69b0 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java
@@ -3,14 +3,17 @@ package com.qs.serve.modules.vtb.controller;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.qs.serve.common.config.properties.ProjectApisProperties;
-import com.qs.serve.common.model.annotation.LimitSubmit;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.*;
+import com.qs.serve.framework.base.config.properties.ProjectApisProperties;
+import com.qs.serve.common.annotation.LimitSubmit;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.seeyon.entity.CtpAffair;
 import com.qs.serve.modules.seeyon.entity.CtpAffairQo;
 import com.qs.serve.modules.seeyon.entity.bo.CtpAddNodeParam;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationDataController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationDataController.java
index b7196cd..3837861 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationDataController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationDataController.java
@@ -1,10 +1,9 @@
 package com.qs.serve.modules.vtb.controller;
 
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.Assert;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.bus.QueryFilterUtil;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.framework.base.util.bus.QueryFilterUtil;
 import com.qs.serve.modules.vtb.entity.dto.VtbActivityCheckDTO;
 import com.qs.serve.modules.vtb.entity.dto.VtbVerificationDTO;
 import com.qs.serve.modules.vtb.entity.so.VtbActivityCheckSo;
@@ -18,9 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.math.BigDecimal;
-import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 /**
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java
index 59f7072..0d558bb 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java
@@ -1,6 +1,5 @@
 package com.qs.serve.modules.vtb.entity;
 
-import java.time.LocalDate;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -10,8 +9,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
-import com.qs.serve.modules.sys.entity.SysAttach;
+import com.qs.serve.mbp.handler.SplitStringTypeHandler;
 import com.qs.serve.modules.tag.entity.so.TagQuery;
 import lombok.Data;
 import org.apache.ibatis.type.JdbcType;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/mapper/VtbFundFlowMapper.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/mapper/VtbFundFlowMapper.java
index ae1347f..404b9e9 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/mapper/VtbFundFlowMapper.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/mapper/VtbFundFlowMapper.java
@@ -2,7 +2,7 @@ package com.qs.serve.modules.vtb.mapper;
 
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.qs.serve.common.model.AmountDTO;
+import com.qs.serve.framework.base.model.AmountDTO;
 import com.qs.serve.modules.vtb.entity.VtbFundFlow;
 import com.qs.serve.modules.vtb.entity.dto.VtbFundFlowSumAmtDTO;
 import org.apache.ibatis.annotations.Param;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/mapper/VtbVerForPayReportMapper.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/mapper/VtbVerForPayReportMapper.java
index c771829..c9e718f 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/mapper/VtbVerForPayReportMapper.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/mapper/VtbVerForPayReportMapper.java
@@ -1,11 +1,9 @@
 package com.qs.serve.modules.vtb.mapper;
 
-import com.qs.serve.common.model.dto.RowParam;
+import com.qs.serve.framework.base.model.dto.RowParam;
 import com.qs.serve.modules.vtb.entity.dto.PayPaymentItemExtend;
-import com.qs.serve.modules.vtb.entity.dto.VtbActivityCheckDTO;
 import com.qs.serve.modules.vtb.entity.dto.VtbVerificationDTO;
 import com.qs.serve.modules.vtb.entity.so.PayPaymentItemExtendSo;
-import com.qs.serve.modules.vtb.entity.so.VtbActivityCheckSo;
 import com.qs.serve.modules.vtb.entity.so.VtbVerificationCheckSo;
 import org.apache.ibatis.annotations.Param;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java
index 4ac255f..9a9d83b 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java
@@ -1,8 +1,10 @@
 package com.qs.serve.modules.vtb.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.CopierUtil;
 import com.qs.serve.modules.data.entity.DataAffairCommit;
 import com.qs.serve.modules.data.mapper.DataAffairCommitMapper;
 import com.qs.serve.modules.seeyon.entity.CtpAffair;
@@ -33,7 +35,6 @@ import com.qs.serve.modules.vtb.service.impl.VtbVerificationOperationServiceImpl
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
-import org.springframework.beans.BeansException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestBody;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationService.java
index 7f000ca..008e6df 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationService.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationService.java
@@ -2,7 +2,7 @@ package com.qs.serve.modules.vtb.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qs.serve.common.model.dto.R;
+import com.qs.serve.framework.base.model.R;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.tbs.entity.TbsActivity;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbFundFlowServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbFundFlowServiceImpl.java
index 1fbb947..14032af 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbFundFlowServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbFundFlowServiceImpl.java
@@ -2,8 +2,8 @@ package com.qs.serve.modules.vtb.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.common.util.JsonUtil;
+import com.qs.serve.framework.base.util.CollectionUtil;
+import com.qs.serve.framework.base.util.JsonUtil;
 import com.qs.serve.modules.bir.consts.BirActivityCenterGoodsUtil;
 import com.qs.serve.modules.tbs.common.TbsActivityState;
 import com.qs.serve.modules.tbs.entity.*;
@@ -11,7 +11,6 @@ import com.qs.serve.modules.tbs.mapper.TbsActivityPayConditionMapper;
 import com.qs.serve.modules.tbs.mapper.TbsCostApplyMapper;
 import com.qs.serve.modules.tbs.service.*;
 import com.qs.serve.modules.vtb.common.VtbFundFlowType;
-import com.qs.serve.modules.vtb.entity.VtbVerificationSubject;
 import com.qs.serve.modules.vtb.entity.VtbVerificationSubjectCenter;
 import com.qs.serve.modules.vtb.service.VtbVerificationSubjectCenterService;
 import lombok.AllArgsConstructor;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationApplication2Impl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationApplication2Impl.java
index f0bc807..88a6c32 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationApplication2Impl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationApplication2Impl.java
@@ -1,8 +1,8 @@
 package com.qs.serve.modules.vtb.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.config.properties.ProjectApisProperties;
-import com.qs.serve.common.util.CollectionUtil;
+import com.qs.serve.framework.base.config.properties.ProjectApisProperties;
+import com.qs.serve.framework.base.util.CollectionUtil;
 import com.qs.serve.modules.seeyon.service.SeeYonRequestService;
 import com.qs.serve.modules.sys.entity.SysAttach;
 import com.qs.serve.modules.sys.entity.SysUser;
@@ -16,7 +16,6 @@ import com.qs.serve.modules.vtb.entity.*;
 import com.qs.serve.modules.vtb.mapper.VtbVerificationMapper;
 import com.qs.serve.modules.vtb.service.*;
 import lombok.AllArgsConstructor;
-import lombok.RequiredArgsConstructor;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchOperationServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchOperationServiceImpl.java
index af05c26..1aef6ed 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchOperationServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchOperationServiceImpl.java
@@ -2,8 +2,10 @@ package com.qs.serve.modules.vtb.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.CopierUtil;
 import com.qs.serve.modules.data.entity.DataAffairCommit;
 import com.qs.serve.modules.data.mapper.DataAffairCommitMapper;
 import com.qs.serve.modules.seeyon.entity.CtpAffair;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchServiceImpl.java
index e0d6ffa..66fc474 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationBatchServiceImpl.java
@@ -4,15 +4,16 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.config.properties.ProjectProperties;
-import com.qs.serve.common.framework.redis.RedisService;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.oa.OaFormMainProcess;
-import com.qs.serve.common.model.oa.OaUploadFile;
+import com.qs.serve.framework.base.config.properties.ProjectProperties;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.framework.base.model.oa.OaFormMainProcess;
+import com.qs.serve.framework.base.model.oa.OaUploadFile;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
 import com.qs.serve.modules.tag.util.TagFiledUtil;
-import com.qs.serve.common.util.*;
-import com.qs.serve.common.util.model.DateFormatString;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.framework.base.util.model.DateFormatString;
 import com.qs.serve.modules.bms.entity.*;
 import com.qs.serve.modules.bms.mapper.BmsRegion2Mapper;
 import com.qs.serve.modules.bms.mapper.BmsRegionMapper;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java
index be59622..8dd68ef 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java
@@ -2,10 +2,9 @@ package com.qs.serve.modules.vtb.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.util.*;
 import com.qs.serve.modules.seeyon.service.SeeYonOperationService;
-import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.tbs.common.TbsActivityState;
 import com.qs.serve.modules.tbs.common.TbsCostApplyState;
 import com.qs.serve.modules.tbs.common.TbsSeeYonConst;
@@ -28,7 +27,6 @@ import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.List;
 
 /**
  * @author YenHex
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java
index c924fbc..3ef0703 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java
@@ -4,17 +4,21 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.config.properties.ProjectApisProperties;
-import com.qs.serve.common.config.properties.ProjectProperties;
-import com.qs.serve.common.framework.redis.RedisService;
-import com.qs.serve.common.model.AmountDTO;
-import com.qs.serve.common.model.enums.BudgetLogOptFlag;
-import com.qs.serve.common.model.dto.R;
+import com.qs.serve.framework.base.config.properties.ProjectApisProperties;
+import com.qs.serve.framework.base.config.properties.ProjectProperties;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.framework.base.model.AmountDTO;
+import com.qs.serve.common.enums.BudgetLogOptFlag;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.sync.AsyncFactory;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
 import com.qs.serve.modules.tag.util.TagFiledUtil;
-import com.qs.serve.common.util.*;
-import com.qs.serve.common.util.model.DateFormatString;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.framework.base.util.model.DateFormatString;
 import com.qs.serve.modules.bir.consts.BirActivityCenterGoodsUtil;
 import com.qs.serve.modules.bir.service.BirCenterRateService;
 import com.qs.serve.modules.bms.entity.*;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/api/WxSvcUserApi.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/api/WxSvcUserApi.java
index cf5baa7..c4f87a5 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/api/WxSvcUserApi.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/api/WxSvcUserApi.java
@@ -1,15 +1,16 @@
 package com.qs.serve.modules.wx.api;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.framework.redis.RedisService;
-import com.qs.serve.common.framework.security.model.LoginUser;
-import com.qs.serve.common.model.annotation.LimitSubmit;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.consts.RedisCacheKeys;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.InterType;
-import com.qs.serve.common.util.*;
+import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.framework.base.framework.security.model.LoginUser;
+import com.qs.serve.common.annotation.LimitSubmit;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.consts.RedisCacheKeys;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.InterType;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.base.TencentYunSmsService;
 import com.qs.serve.modules.base.TianYiYunSmsService;
 import com.qs.serve.modules.sys.entity.SysRole;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/common/conf/WxMpConfig.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/common/conf/WxMpConfig.java
index 55825d9..b4b06a2 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/common/conf/WxMpConfig.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/common/conf/WxMpConfig.java
@@ -2,22 +2,19 @@ package com.qs.serve.modules.wx.common.conf;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.config.properties.RedisProperties;
+import com.qs.serve.framework.base.config.properties.RedisProperties;
 import com.qs.serve.modules.wx.common.consts.WxStatusConst;
 import com.qs.serve.modules.wx.common.handler.mp.*;
 import com.qs.serve.modules.wx.entity.WxApp;
 import com.qs.serve.modules.wx.service.WxAppService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import me.chanjar.weixin.common.redis.RedisTemplateWxRedisOps;
 import me.chanjar.weixin.mp.api.WxMpMessageRouter;
 import me.chanjar.weixin.mp.api.WxMpService;
-import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
 import me.chanjar.weixin.mp.api.impl.WxMpServiceOkHttpImpl;
 import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Scope;
 
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/common/handler/mp/LogHandler.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/common/handler/mp/LogHandler.java
index c433c05..2789299 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/common/handler/mp/LogHandler.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/common/handler/mp/LogHandler.java
@@ -1,6 +1,6 @@
 package com.qs.serve.modules.wx.common.handler.mp;
 
-import com.qs.serve.common.util.JsonUtil;
+import com.qs.serve.framework.base.util.JsonUtil;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.session.WxSessionManager;
 import me.chanjar.weixin.mp.api.WxMpMessageHandler;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/common/handler/mp/MsgHandler.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/common/handler/mp/MsgHandler.java
index 9ed90cd..473218b 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/common/handler/mp/MsgHandler.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/common/handler/mp/MsgHandler.java
@@ -1,6 +1,6 @@
 package com.qs.serve.modules.wx.common.handler.mp;
 
-import com.qs.serve.common.util.JsonUtil;
+import com.qs.serve.framework.base.util.JsonUtil;
 import com.qs.serve.modules.wx.common.builder.mp.TextBuilder;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.common.session.WxSessionManager;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/controller/WxAppController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/controller/WxAppController.java
index 143e9d2..757a642 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/controller/WxAppController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/controller/WxAppController.java
@@ -1,9 +1,9 @@
 package com.qs.serve.modules.wx.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.wx.entity.WxApp;
 import com.qs.serve.modules.wx.service.WxAppService;
 import lombok.extern.slf4j.Slf4j;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/controller/WxFormPushController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/controller/WxFormPushController.java
index 29523d3..236b862 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/controller/WxFormPushController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/controller/WxFormPushController.java
@@ -1,28 +1,25 @@
 package com.qs.serve.modules.wx.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.framework.base.util.CollectionUtil;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.sys.entity.SysAttach;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.sys.service.SysAttachService;
 import com.qs.serve.modules.sys.service.SysUserService;
 import com.qs.serve.modules.wx.entity.*;
 import com.qs.serve.modules.wx.entity.dto.sms.WxSmsNewForm;
-import com.qs.serve.modules.wx.entity.vo.WxPushResultVo;
 import com.qs.serve.modules.wx.mapper.WxFormPushMapper;
 import com.qs.serve.modules.wx.service.*;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import me.chanjar.weixin.mp.api.WxMpService;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import com.qs.serve.modules.wx.entity.bo.WxFormPushBo;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/controller/WxFormPushTypeController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/controller/WxFormPushTypeController.java
index 46aacb6..8ce1b81 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/controller/WxFormPushTypeController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/controller/WxFormPushTypeController.java
@@ -1,19 +1,17 @@
 package com.qs.serve.modules.wx.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
-import com.qs.serve.modules.wx.entity.WxFormPush;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.wx.service.WxFormPushService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import com.qs.serve.modules.wx.entity.so.WxFormPushTypeSo;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/controller/WxFormPushUserController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/controller/WxFormPushUserController.java
index bc6d5e4..87bce0c 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/controller/WxFormPushUserController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/controller/WxFormPushUserController.java
@@ -1,17 +1,16 @@
 package com.qs.serve.modules.wx.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.CopierUtil;
+import com.qs.serve.common.utils.StringUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import com.qs.serve.modules.wx.entity.so.WxFormPushUserSo;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/controller/WxTemplateMsgController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/controller/WxTemplateMsgController.java
index 68316df..5c7de4d 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/controller/WxTemplateMsgController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/controller/WxTemplateMsgController.java
@@ -1,9 +1,9 @@
 package com.qs.serve.modules.wx.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.PageUtil;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.wx.entity.WxTemplateMsg;
 import com.qs.serve.modules.wx.service.WxTemplateMsgService;
 import lombok.extern.slf4j.Slf4j;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/controller/WxUserController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/controller/WxUserController.java
index 9f997ab..efe77a6 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/controller/WxUserController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/controller/WxUserController.java
@@ -1,13 +1,12 @@
 package com.qs.serve.modules.wx.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.qs.serve.common.framework.redis.RedisService;
-import com.qs.serve.common.model.consts.RedisCacheKeys;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.framework.base.model.consts.RedisCacheKeys;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.utils.PageUtil;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.sys.service.SysUserService;
 import com.qs.serve.modules.wx.entity.WxUser;
@@ -16,7 +15,6 @@ import com.qs.serve.modules.wx.entity.dto.WxUserRmBindBo;
 import com.qs.serve.modules.wx.service.WxUserService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/controller/my/WxFormPushMyController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/controller/my/WxFormPushMyController.java
index 06d0c1a..7b7dd21 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/controller/my/WxFormPushMyController.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/controller/my/WxFormPushMyController.java
@@ -1,12 +1,13 @@
 package com.qs.serve.modules.wx.controller.my;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.qs.serve.common.model.annotation.SysLog;
-import com.qs.serve.common.model.dto.PageVo;
-import com.qs.serve.common.model.dto.R;
-import com.qs.serve.common.model.enums.BizType;
-import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.annotation.SysLog;
+import com.qs.serve.framework.base.model.PageVo;
+import com.qs.serve.framework.base.model.R;
+import com.qs.serve.common.enums.BizType;
+import com.qs.serve.common.enums.SystemModule;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.PageUtil;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
 import com.qs.serve.modules.sys.entity.SysAttach;
 import com.qs.serve.modules.sys.service.SysAttachService;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/entity/WxFormPush.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/entity/WxFormPush.java
index 32e7619..e53e605 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/entity/WxFormPush.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/entity/WxFormPush.java
@@ -2,7 +2,6 @@ package com.qs.serve.modules.wx.entity;
 
 import java.time.LocalDate;
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 
@@ -10,15 +9,12 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
+import com.qs.serve.mbp.handler.SplitStringTypeHandler;
 import lombok.Data;
 import org.apache.ibatis.type.JdbcType;
 import org.hibernate.validator.constraints.Length;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.NotBlank;
-
 /**
  * 表单推送 实体类
  * @author YenHex
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/entity/dto/sms/WxSmsNewForm.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/entity/dto/sms/WxSmsNewForm.java
index d080631..9bf8d0e 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/entity/dto/sms/WxSmsNewForm.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/entity/dto/sms/WxSmsNewForm.java
@@ -1,7 +1,7 @@
 package com.qs.serve.modules.wx.entity.dto.sms;
 
-import com.qs.serve.common.util.model.wx.WxSmsProp;
-import com.qs.serve.common.util.model.wx.SmsBaseDto;
+import com.qs.serve.framework.base.util.model.wx.WxSmsProp;
+import com.qs.serve.framework.base.util.model.wx.SmsBaseDto;
 import lombok.Getter;
 import lombok.Setter;
 
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/service/WxPushService.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/service/WxPushService.java
index b2f2986..e573a9b 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/service/WxPushService.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/service/WxPushService.java
@@ -1,7 +1,7 @@
 package com.qs.serve.modules.wx.service;
 
 import com.qs.serve.modules.wx.entity.WxUser;
-import com.qs.serve.common.util.model.wx.SmsBaseDto;
+import com.qs.serve.framework.base.util.model.wx.SmsBaseDto;
 import me.chanjar.weixin.mp.bean.template.WxMpTemplateMessage;
 
 /**
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/service/impl/WxPushServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/service/impl/WxPushServiceImpl.java
index c4ac93b..e0a505a 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/service/impl/WxPushServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/service/impl/WxPushServiceImpl.java
@@ -1,12 +1,12 @@
 package com.qs.serve.modules.wx.service.impl;
 
 import com.qs.serve.modules.sys.common.AuthContextUtils;
-import com.qs.serve.common.util.JsonUtil;
-import com.qs.serve.common.util.SmsReflectUtil;
+import com.qs.serve.framework.base.util.JsonUtil;
+import com.qs.serve.framework.base.util.SmsReflectUtil;
 import com.qs.serve.modules.wx.common.conf.WxMpConfig;
 import com.qs.serve.modules.wx.entity.WxTemplateMsg;
 import com.qs.serve.modules.wx.entity.WxUser;
-import com.qs.serve.common.util.model.wx.SmsBaseDto;
+import com.qs.serve.framework.base.util.model.wx.SmsBaseDto;
 import com.qs.serve.modules.wx.service.WxPushService;
 import com.qs.serve.modules.wx.service.WxTemplateMsgService;
 import lombok.AllArgsConstructor;
diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/service/impl/WxUserServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/service/impl/WxUserServiceImpl.java
index c8c2025..49d7c61 100644
--- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/service/impl/WxUserServiceImpl.java
+++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/wx/service/impl/WxUserServiceImpl.java
@@ -2,11 +2,14 @@ package com.qs.serve.modules.wx.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qs.serve.common.framework.redis.RedisService;
-import com.qs.serve.common.model.consts.GySysConst;
-import com.qs.serve.common.model.consts.RedisCacheKeys;
-import com.qs.serve.common.model.enums.HttpCode;
-import com.qs.serve.common.util.*;
+import com.qs.serve.common.exception.Assert;
+import com.qs.serve.framework.base.framework.redis.RedisService;
+import com.qs.serve.framework.base.model.consts.GySysConst;
+import com.qs.serve.framework.base.model.consts.RedisCacheKeys;
+import com.qs.serve.common.enums.HttpCode;
+import com.qs.serve.framework.base.util.*;
+import com.qs.serve.common.utils.ServletUtils;
+import com.qs.serve.common.utils.StringUtils;
 import com.qs.serve.modules.sys.common.AuthContextUtils;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.sys.mapper.SysUserMapper;
diff --git a/cms-modules/cms-system/src/main/resources/mapper/bms/BmsSupplierMapper.xml b/cms-modules/cms-system/src/main/resources/mapper/bms/BmsSupplierMapper.xml
index 777829e..13c2d1a 100644
--- a/cms-modules/cms-system/src/main/resources/mapper/bms/BmsSupplierMapper.xml
+++ b/cms-modules/cms-system/src/main/resources/mapper/bms/BmsSupplierMapper.xml
@@ -25,7 +25,7 @@
         <result property="userCode"  column="user_code"/>
         <result property="userName"  column="user_name"/>
         <result property="belong"  column="belong"/>
-        <result property="otherUserIds"  column="other_user_ids" typeHandler="com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler"/>
+        <result property="otherUserIds"  column="other_user_ids" typeHandler="com.qs.serve.mbp.handler.SplitStringTypeHandler"/>
         <result property="otherUserNames"  column="other_user_names"/>
         <result property="otherUserCodes"  column="other_user_codes"/>
         <result property="createTime"  column="create_time"/>
diff --git a/cms-modules/cms-system/src/main/resources/mapper/goods/GoodsFeedbackMapper.xml b/cms-modules/cms-system/src/main/resources/mapper/goods/GoodsFeedbackMapper.xml
index 1a3cf74..d3abd55 100644
--- a/cms-modules/cms-system/src/main/resources/mapper/goods/GoodsFeedbackMapper.xml
+++ b/cms-modules/cms-system/src/main/resources/mapper/goods/GoodsFeedbackMapper.xml
@@ -6,11 +6,11 @@
 
     <resultMap id="goodsFeedbackMap" type="com.qs.serve.modules.goods.entity.vo.GoodsFeedbackVo" >
         <result property="id"  column="id"/>
-        <result property="spuIds"  column="spu_ids" typeHandler="com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler"/>
-        <result property="skuIds"  column="sku_ids" typeHandler="com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler"/>
-        <result property="imgUrls"  column="img_urls" typeHandler="com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler"/>
+        <result property="spuIds"  column="spu_ids" typeHandler="com.qs.serve.mbp.handler.SplitStringTypeHandler"/>
+        <result property="skuIds"  column="sku_ids" typeHandler="com.qs.serve.mbp.handler.SplitStringTypeHandler"/>
+        <result property="imgUrls"  column="img_urls" typeHandler="com.qs.serve.mbp.handler.SplitStringTypeHandler"/>
         <result property="feedbackTypeId"  column="feedback_type_id"/>
-        <result property="feedbackTypeNames"  column="feedback_type_names" typeHandler="com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler"/>
+        <result property="feedbackTypeNames"  column="feedback_type_names" typeHandler="com.qs.serve.mbp.handler.SplitStringTypeHandler"/>
         <result property="feedbackText"  column="feedback_text"/>
         <result property="userId"  column="user_id"/>
         <result property="userCode"  column="user_code"/>
diff --git a/cms-modules/cms-system/src/main/resources/mapper/goods/GoodsSpuMapper.xml b/cms-modules/cms-system/src/main/resources/mapper/goods/GoodsSpuMapper.xml
index 0541a2d..53728a3 100644
--- a/cms-modules/cms-system/src/main/resources/mapper/goods/GoodsSpuMapper.xml
+++ b/cms-modules/cms-system/src/main/resources/mapper/goods/GoodsSpuMapper.xml
@@ -12,7 +12,7 @@
         <result property="categorySecond"  column="category_second"/>
         <result property="categoryThird"  column="category_third"/>
         <result property="categoryLast"  column="category_last"/>
-        <result property="picUrls"  column="pic_urls" typeHandler="com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler" />
+        <result property="picUrls"  column="pic_urls" typeHandler="com.qs.serve.mbp.handler.SplitStringTypeHandler" />
         <result property="shelf"  column="shelf"/>
         <result property="sort"  column="sort"/>
         <result property="saleNum"  column="sale_num"/>
diff --git a/cms-modules/cms-system/src/main/resources/mapper/pay/PayPaymentItemMapper.xml b/cms-modules/cms-system/src/main/resources/mapper/pay/PayPaymentItemMapper.xml
index 9273760..d817fbe 100644
--- a/cms-modules/cms-system/src/main/resources/mapper/pay/PayPaymentItemMapper.xml
+++ b/cms-modules/cms-system/src/main/resources/mapper/pay/PayPaymentItemMapper.xml
@@ -90,7 +90,7 @@
     </select>
 
 
-    <select id="selectActivityTotal" resultType="com.qs.serve.common.model.AmountDTO">
+    <select id="selectActivityTotal" resultType="com.qs.serve.framework.base.model.AmountDTO">
         SELECT activity_id as id,sum(item_pay_amount) as amount FROM `pay_payment_item`
         where sync_act_flag=0 and del_flag = 0
         and activity_id in
@@ -101,7 +101,7 @@
     </select>
 
 
-    <select id="selectCostTotal" resultType="com.qs.serve.common.model.AmountDTO">
+    <select id="selectCostTotal" resultType="com.qs.serve.framework.base.model.AmountDTO">
         SELECT cost_apply_id as id,sum(pay_amount) as amount FROM `pay_payment`
         where del_flag = 0
         and cost_apply_id in
diff --git a/cms-modules/cms-system/src/main/resources/mapper/tbs/TbsBudgetMatchMapper.xml b/cms-modules/cms-system/src/main/resources/mapper/tbs/TbsBudgetMatchMapper.xml
index c9f774c..6a7d944 100644
--- a/cms-modules/cms-system/src/main/resources/mapper/tbs/TbsBudgetMatchMapper.xml
+++ b/cms-modules/cms-system/src/main/resources/mapper/tbs/TbsBudgetMatchMapper.xml
@@ -68,7 +68,7 @@
         )
     </select>
 
-    <select id="getBudgetUsedAmount" resultType="com.qs.serve.common.model.AmountDTO">
+    <select id="getBudgetUsedAmount" resultType="com.qs.serve.framework.base.model.AmountDTO">
         select sum(tbg.amount) as amount,tbg.schedule_item_budget_id as id
         from tbs_budget_log tbg
         where tbg.opt_type not in(0,2,3)
@@ -80,7 +80,7 @@
         GROUP BY tbg.schedule_item_budget_id
     </select>
 
-    <select id="getBudgetNotUsedAmount" resultType="com.qs.serve.common.model.AmountDTO">
+    <select id="getBudgetNotUsedAmount" resultType="com.qs.serve.framework.base.model.AmountDTO">
         select sum(tbg.amount) as amount,tbg.schedule_item_budget_id as id
         from tbs_budget_log tbg
         where  tbg.del_flag = 0
@@ -94,7 +94,7 @@
         GROUP BY tbg.schedule_item_budget_id
     </select>
 
-    <select id="getBudgetFinalUsedAmount" resultType="com.qs.serve.common.model.AmountDTO">
+    <select id="getBudgetFinalUsedAmount" resultType="com.qs.serve.framework.base.model.AmountDTO">
         select sum(tbg.amount) as amount,tbg.schedule_item_budget_id as id
         from tbs_budget_log tbg
         where tbg.opt_type in(0,2,3)
diff --git a/cms-modules/cms-system/src/main/resources/mapper/vtb/VtbFundFlowMapper.xml b/cms-modules/cms-system/src/main/resources/mapper/vtb/VtbFundFlowMapper.xml
index 4805489..fe6b693 100644
--- a/cms-modules/cms-system/src/main/resources/mapper/vtb/VtbFundFlowMapper.xml
+++ b/cms-modules/cms-system/src/main/resources/mapper/vtb/VtbFundFlowMapper.xml
@@ -85,7 +85,7 @@
             vtb_fund_flow.activity_id
     </select>
 
-    <select id="listActivityCenterGoodsUsed" resultType="com.qs.serve.common.model.AmountDTO">
+    <select id="listActivityCenterGoodsUsed" resultType="com.qs.serve.framework.base.model.AmountDTO">
         select sum(vtb_fund_flow.used_amount) as amount,
                center_good_item_id as id
         from vtb_fund_flow
diff --git a/cms-modules/cms-system/src/main/resources/mapper/vtb/VtbVerfifcationMapper.xml b/cms-modules/cms-system/src/main/resources/mapper/vtb/VtbVerfifcationMapper.xml
index ce2e643..6d9bd92 100644
--- a/cms-modules/cms-system/src/main/resources/mapper/vtb/VtbVerfifcationMapper.xml
+++ b/cms-modules/cms-system/src/main/resources/mapper/vtb/VtbVerfifcationMapper.xml
@@ -12,7 +12,7 @@
         <result property="activityId"  column="activity_id"/>
         <result property="policyItemId"  column="policy_item_id"/>
         <result property="policyItemCode"  column="policy_item_code"/>
-        <result property="attachIds"  column="attach_ids" typeHandler="com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler"  />
+        <result property="attachIds"  column="attach_ids" typeHandler="com.qs.serve.mbp.handler.SplitStringTypeHandler"  />
         <result property="verificationState"  column="verification_state"/>
         <result property="paymentState"  column="payment_state"/>
         <result property="regReleaseFlag"  column="reg_release_flag"/>