diff --git a/src/main/java/com/youlai/boot/framework/security/config/SecurityConfig.java b/src/main/java/com/youlai/boot/framework/security/config/SecurityConfig.java
index 68359818..190175e6 100644
--- a/src/main/java/com/youlai/boot/framework/security/config/SecurityConfig.java
+++ b/src/main/java/com/youlai/boot/framework/security/config/SecurityConfig.java
@@ -9,7 +9,7 @@ import com.youlai.boot.framework.security.filter.TokenAuthenticationFilter;
 import com.youlai.boot.framework.security.handler.MyAccessDeniedHandler;
 import com.youlai.boot.framework.security.handler.MyAuthenticationEntryPoint;
 import com.youlai.boot.framework.security.provider.SmsAuthenticationProvider;
-import com.youlai.boot.framework.security.provider.WechatMiniAuthenticationProvider;
+import com.youlai.boot.framework.security.provider.WxMaAuthenticationProvider;
 import com.youlai.boot.framework.security.token.TokenManager;
 import com.youlai.boot.framework.security.service.SysUserDetailsService;
 import com.youlai.boot.system.service.ConfigService;
@@ -132,11 +132,11 @@ public class SecurityConfig {
      * 微信小程序认证 Provider
      */
     @Bean
-    public WechatMiniAuthenticationProvider wechatMiniAuthenticationProvider(
+    public WxMaAuthenticationProvider wechatMiniAuthenticationProvider(
             WxMaService wxMaService,
             SysUserDetailsService sysUserDetailsService
     ) {
-        return new WechatMiniAuthenticationProvider(wxMaService, sysUserDetailsService);
+        return new WxMaAuthenticationProvider(wxMaService, sysUserDetailsService);
     }
 
     /**
@@ -146,12 +146,12 @@ public class SecurityConfig {
     public AuthenticationManager authenticationManager(
             DaoAuthenticationProvider daoAuthenticationProvider,
             SmsAuthenticationProvider smsAuthenticationProvider,
-            WechatMiniAuthenticationProvider wechatMiniAuthenticationProvider
+            WxMaAuthenticationProvider wxMaAuthenticationProvider
     ) {
         return new ProviderManager(
                 daoAuthenticationProvider,
                 smsAuthenticationProvider,
-                wechatMiniAuthenticationProvider
+            wxMaAuthenticationProvider
         );
     }
 
diff --git a/src/main/java/com/youlai/boot/framework/security/model/WechatMiniAuthenticationToken.java b/src/main/java/com/youlai/boot/framework/security/model/WxMaAuthenticationToken.java
similarity index 76%
rename from src/main/java/com/youlai/boot/framework/security/model/WechatMiniAuthenticationToken.java
rename to src/main/java/com/youlai/boot/framework/security/model/WxMaAuthenticationToken.java
index 9bd78bcd..b07ad3f3 100644
--- a/src/main/java/com/youlai/boot/framework/security/model/WechatMiniAuthenticationToken.java
+++ b/src/main/java/com/youlai/boot/framework/security/model/WxMaAuthenticationToken.java
@@ -10,7 +10,7 @@ import java.util.Collection;
 /**
  * 微信小程序认证 Token
  */
-public class WechatMiniAuthenticationToken extends AbstractAuthenticationToken {
+public class WxMaAuthenticationToken extends AbstractAuthenticationToken {
 
     @Serial
     private static final long serialVersionUID = 622L;
@@ -34,7 +34,7 @@ public class WechatMiniAuthenticationToken extends AbstractAuthenticationToken {
      *
      * @param code 微信小程序code
      */
-    public WechatMiniAuthenticationToken(String code) {
+    public WxMaAuthenticationToken(String code) {
         super(AuthorityUtils.NO_AUTHORITIES);
         this.principal = code;
         this.credentials = null;
@@ -47,7 +47,7 @@ public class WechatMiniAuthenticationToken extends AbstractAuthenticationToken {
      * @param principal   用户详情（SysUserDetails）
      * @param authorities 授权信息
      */
-    public WechatMiniAuthenticationToken(Object principal, Collection<? extends GrantedAuthority> authorities) {
+    public WxMaAuthenticationToken(Object principal, Collection<? extends GrantedAuthority> authorities) {
         super(authorities);
         this.principal = principal;
         this.credentials = null;
@@ -57,8 +57,8 @@ public class WechatMiniAuthenticationToken extends AbstractAuthenticationToken {
     /**
      * 创建已认证的 Token（静态工厂方法）
      */
-    public static WechatMiniAuthenticationToken authenticated(Object principal, Collection<? extends GrantedAuthority> authorities) {
-        return new WechatMiniAuthenticationToken(principal, authorities);
+    public static WxMaAuthenticationToken authenticated(Object principal, Collection<? extends GrantedAuthority> authorities) {
+        return new WxMaAuthenticationToken(principal, authorities);
     }
 
     @Override
diff --git a/src/main/java/com/youlai/boot/framework/security/provider/WechatMiniAuthenticationProvider.java b/src/main/java/com/youlai/boot/framework/security/provider/WxMaAuthenticationProvider.java
similarity index 91%
rename from src/main/java/com/youlai/boot/framework/security/provider/WechatMiniAuthenticationProvider.java
rename to src/main/java/com/youlai/boot/framework/security/provider/WxMaAuthenticationProvider.java
index 8c7dd2c3..d30bfd60 100644
--- a/src/main/java/com/youlai/boot/framework/security/provider/WechatMiniAuthenticationProvider.java
+++ b/src/main/java/com/youlai/boot/framework/security/provider/WxMaAuthenticationProvider.java
@@ -6,7 +6,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.youlai.boot.framework.security.exception.NeedBindMobileException;
 import com.youlai.boot.framework.security.model.SysUserDetails;
 import com.youlai.boot.framework.security.model.UserAuthInfo;
-import com.youlai.boot.framework.security.model.WechatMiniAuthenticationToken;
+import com.youlai.boot.framework.security.model.WxMaAuthenticationToken;
 import com.youlai.boot.framework.security.service.SysUserDetailsService;
 import com.youlai.boot.system.model.entity.UserSocial;
 import lombok.RequiredArgsConstructor;
@@ -23,7 +23,7 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException;
  */
 @Slf4j
 @RequiredArgsConstructor
-public class WechatMiniAuthenticationProvider implements AuthenticationProvider {
+public class WxMaAuthenticationProvider implements AuthenticationProvider {
 
     private final WxMaService wxMaService;
     private final SysUserDetailsService sysUserDetailsService;
@@ -76,7 +76,7 @@ public class WechatMiniAuthenticationProvider implements AuthenticationProvider
 
             log.info("微信小程序登录成功：username={}, openid={}", userAuthInfo.getUsername(), openid);
 
-            return WechatMiniAuthenticationToken.authenticated(userDetails, userDetails.getAuthorities());
+            return WxMaAuthenticationToken.authenticated(userDetails, userDetails.getAuthorities());
 
         } catch (WxErrorException e) {
             log.error("微信小程序登录失败：调用微信接口异常，code={}", code, e);
@@ -86,7 +86,7 @@ public class WechatMiniAuthenticationProvider implements AuthenticationProvider
 
     @Override
     public boolean supports(Class<?> authentication) {
-        return WechatMiniAuthenticationToken.class.isAssignableFrom(authentication);
+        return WxMaAuthenticationToken.class.isAssignableFrom(authentication);
     }
 
 }
diff --git a/src/main/resources/templates/codegen/frontend/js/index.curd.js.vue.vm b/src/main/resources/templates/codegen/frontend/js/index.curd.js.vue.vm
index fe944777..774cfa02 100644
--- a/src/main/resources/templates/codegen/frontend/js/index.curd.js.vue.vm
+++ b/src/main/resources/templates/codegen/frontend/js/index.curd.js.vue.vm
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container h-full flex flex-1 flex-col">
+  <div class="page-container h-full flex flex-1 flex-col">
     <!-- 搜索 -->
     <PageSearch
       ref="searchRef"
diff --git a/src/main/resources/templates/codegen/frontend/js/index.js.vue.vm b/src/main/resources/templates/codegen/frontend/js/index.js.vue.vm
index 462d2b5c..86ff5b17 100644
--- a/src/main/resources/templates/codegen/frontend/js/index.js.vue.vm
+++ b/src/main/resources/templates/codegen/frontend/js/index.js.vue.vm
@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container">
-    <div class="filter-section">
+  <div class="page-container">
+    <el-card class="page-search" shadow="never">
       <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto">
         #foreach($fieldConfig in $fieldConfigs)
           #if($fieldConfig.isShowInQuery == 1)
@@ -88,16 +88,16 @@
             </el-form-item>
           #end
         #end
-        <el-form-item class="search-buttons">
+        <el-form-item>
           <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
           <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
         </el-form-item>
       </el-form>
-    </div>
+    </el-card>
 
-    <el-card shadow="hover" class="table-section">
-      <div class="table-section__toolbar">
-        <div class="table-section__toolbar--actions">
+    <el-card class="page-content" shadow="never">
+      <div class="page-toolbar">
+        <div class="page-toolbar__left">
           <el-button
               v-hasPerm="['${moduleName}:${entityKebab}:create']"
               type="success"
@@ -121,7 +121,6 @@
         border
         stripe
         highlight-current-row
-        class="table-section__content"
         row-key="id"
         @selection-change="handleSelectionChange"
       >
@@ -171,13 +170,15 @@
         </el-table-column>
       </el-table>
 
-      <pagination
-          v-if="total > 0"
-          v-model:total="total"
-          v-model:page="queryParams.pageNum"
-          v-model:limit="queryParams.pageSize"
-          @pagination="fetchList"
-      />
+      <div class="page-pagination">
+        <pagination
+            v-if="total > 0"
+            v-model:total="total"
+            v-model:page="queryParams.pageNum"
+            v-model:limit="queryParams.pageSize"
+            @pagination="fetchList"
+        />
+      </div>
     </el-card>
 
     <!-- $!{businessName}表单弹窗 -->
diff --git a/src/main/resources/templates/codegen/frontend/ts/api-types.ts.vm b/src/main/resources/templates/codegen/frontend/ts/api-types.ts.vm
index dbcc50cc..87b9c212 100644
--- a/src/main/resources/templates/codegen/frontend/ts/api-types.ts.vm
+++ b/src/main/resources/templates/codegen/frontend/ts/api-types.ts.vm
@@ -2,7 +2,7 @@
  * ${entityName} $!{businessName}类型定义
  */
 
- import type { BaseQueryParams } from "./common";
+import type { BaseQueryParams } from "@/api/common";
 
 /** $!{businessName}查询参数 */
 export interface ${entityName}QueryParams extends BaseQueryParams {
diff --git a/src/main/resources/templates/codegen/frontend/ts/api.ts.vm b/src/main/resources/templates/codegen/frontend/ts/api.ts.vm
index 5310fd82..8a720b44 100644
--- a/src/main/resources/templates/codegen/frontend/ts/api.ts.vm
+++ b/src/main/resources/templates/codegen/frontend/ts/api.ts.vm
@@ -1,5 +1,6 @@
 import request from "@/utils/request";
-import type { ${entityName}Form, ${entityName}QueryParams, ${entityName}Item } from "@/types/api";
+import type { ${entityName}Form, ${entityName}QueryParams, ${entityName}Item } from "./types";
+import type { PageResult } from "@/api/common";
 
 const ${entityUpperSnake}_BASE_URL = "/api/v1/${entityKebab}";
 
@@ -66,3 +67,6 @@ const ${entityName}API = {
 }
 
 export default ${entityName}API;
+
+// 重导出类型
+export * from "./types";
diff --git a/src/main/resources/templates/codegen/frontend/ts/index.curd.vue.vm b/src/main/resources/templates/codegen/frontend/ts/index.curd.vue.vm
index 15375b18..057a2a9c 100644
--- a/src/main/resources/templates/codegen/frontend/ts/index.curd.vue.vm
+++ b/src/main/resources/templates/codegen/frontend/ts/index.curd.vue.vm
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container h-full flex flex-1 flex-col">
+  <div class="page-container h-full flex flex-1 flex-col">
     <!-- 搜索 -->
     <PageSearch
       ref="searchRef"
@@ -64,7 +64,7 @@
 defineOptions({ name: "$entityName" });
 
 import ${entityName}API from "@/api/${moduleName}/${entityKebab}";
-import type { ${entityName}Form, ${entityName}QueryParams } from "@/types/api";
+import type { ${entityName}Form, ${entityName}QueryParams } from "@/api/${moduleName}/${entityKebab}";
 import type { IObject, IModalConfig, IContentConfig, ISearchConfig } from "@/components/CURD/types";
 import usePage from "@/components/CURD/usePage";
 
@@ -151,8 +151,8 @@ const contentConfig: IContentConfig<${entityName}QueryParams> = reactive({
   // 数据解析函数
   parseData(res: any) {
     return {
-      total: res?.page?.total ?? 0,
-      list: res?.data ?? [],
+      total: res?.total ?? 0,
+      list: res?.list ?? [],
     };
   },
   // 分页配置
diff --git a/src/main/resources/templates/codegen/frontend/ts/index.vue.vm b/src/main/resources/templates/codegen/frontend/ts/index.vue.vm
index e8e776e1..65562529 100644
--- a/src/main/resources/templates/codegen/frontend/ts/index.vue.vm
+++ b/src/main/resources/templates/codegen/frontend/ts/index.vue.vm
@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container">
-    <div class="filter-section">
+  <div class="page-container">
+    <el-card class="page-search" shadow="never">
       <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto">
         #foreach($fieldConfig in $fieldConfigs)
           #if($fieldConfig.isShowInQuery == 1)
@@ -88,16 +88,16 @@
             </el-form-item>
           #end
         #end
-        <el-form-item class="search-buttons">
+        <el-form-item>
           <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
           <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
         </el-form-item>
       </el-form>
-    </div>
+    </el-card>
 
-    <el-card shadow="hover" class="table-section">
-      <div class="table-section__toolbar">
-        <div class="table-section__toolbar--actions">
+    <el-card class="page-content" shadow="never">
+      <div class="page-toolbar">
+        <div class="page-toolbar__left">
           <el-button
               v-hasPerm="['${moduleName}:${entityKebab}:create']"
               type="success"
@@ -121,7 +121,6 @@
         border
         stripe
         highlight-current-row
-        class="table-section__content"
         row-key="id"
         @selection-change="handleSelectionChange"
       >
@@ -171,13 +170,15 @@
         </el-table-column>
       </el-table>
 
-      <pagination
-          v-if="total > 0"
-          v-model:total="total"
-          v-model:page="queryParams.pageNum"
-          v-model:limit="queryParams.pageSize"
-          @pagination="fetchList"
-      />
+      <div class="page-pagination">
+        <pagination
+            v-if="total > 0"
+            v-model:total="total"
+            v-model:page="queryParams.pageNum"
+            v-model:limit="queryParams.pageSize"
+            @pagination="fetchList"
+        />
+      </div>
     </el-card>
 
     <!-- $!{businessName}表单弹窗 -->
@@ -277,7 +278,7 @@
   import { ElMessage, ElMessageBox, type FormInstance, type FormRules } from "element-plus";
   import { useTableSelection } from "@/composables";
   import ${entityName}API from "@/api/${moduleName}/${entityKebab}";
-  import type { ${entityName}Item, ${entityName}Form, ${entityName}QueryParams } from "@/types/api";
+  import type { ${entityName}Item, ${entityName}Form, ${entityName}QueryParams } from "@/api/${moduleName}/${entityKebab}";
 
   defineOptions({
     name: "${entityName}",