diff --git a/app/src/main/resources/sql/mysql/update_all_tables_ddl.sql b/app/src/main/resources/sql/mysql/update_all_tables_ddl.sql
index 879a44c7..e7963c1f 100644
--- a/app/src/main/resources/sql/mysql/update_all_tables_ddl.sql
+++ b/app/src/main/resources/sql/mysql/update_all_tables_ddl.sql
@@ -28,5 +28,4 @@ ALTER TABLE t_platform_history MODIFY tenant_id varchar(60) NULL;
 ALTER TABLE t_task_record MODIFY tenant_id varchar(60) NULL;
 ALTER TABLE t_user MODIFY tenant_id varchar(60) NULL;
 
-ALTER TABLE t_component_library ADD app_id int  NULL;
 
diff --git a/base/src/main/java/com/tinyengine/it/controller/PageController.java b/base/src/main/java/com/tinyengine/it/controller/PageController.java
index c2166b9c..64a64118 100644
--- a/base/src/main/java/com/tinyengine/it/controller/PageController.java
+++ b/base/src/main/java/com/tinyengine/it/controller/PageController.java
@@ -29,7 +29,6 @@
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
-import jakarta.validation.Valid;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -115,7 +114,7 @@ public Result<Page> getPageById(@PathVariable Integer id) throws Exception {
     /**
      * 创建页面
      *
-     * @param page the page
+     * @param request the request
      * @return result
      * @throws Exception the exception
      */
@@ -128,7 +127,8 @@ public Result<Page> getPageById(@PathVariable Integer id) throws Exception {
     })
     @SystemControllerLog(description = "创建页面")
     @PostMapping("/pages/create")
-    public Result<Page> createPage(@Valid @RequestBody Page page) throws Exception {
+    public Result<Page> createPage(HttpServletRequest request) throws IOException {
+        Page page = JsonUtils.decode(request.getInputStream(), Page.class);
         if (page.getIsPage()) {
             // 创建页面
             return pageService.createPage(page);
diff --git a/base/src/main/java/com/tinyengine/it/model/entity/Component.java b/base/src/main/java/com/tinyengine/it/model/entity/Component.java
index 01653160..4181e320 100644
--- a/base/src/main/java/com/tinyengine/it/model/entity/Component.java
+++ b/base/src/main/java/com/tinyengine/it/model/entity/Component.java
@@ -47,6 +47,7 @@ public class Component extends BaseEntity {
     private Map<String, String> name;
 
     @Schema(name = "component", description = "组件")
+    @TableField(value = "name_en")
     private String component;
 
     @Schema(name = "icon", description = "组件图标")
@@ -75,6 +76,7 @@ public class Component extends BaseEntity {
     private Map<String, Object> npm;
 
     @Schema(name = "group", description = "分组")
+    @TableField(value = "`group`")
     private String group;
 
     @Schema(name = "category", description = "分类")
@@ -98,9 +100,11 @@ public class Component extends BaseEntity {
 
     @JsonProperty("public")
     @Schema(name = "public", description = "公开状态：0，1，2")
+    @TableField(value = "public")
     private Integer publicStatus;
 
     @Schema(name = "framework", description = "技术栈")
+    @TableField(value = "framework")
     private String framework;
 
     @Schema(name = "isOfficial", description = "标识官方组件")
@@ -110,6 +114,7 @@ public class Component extends BaseEntity {
     private Boolean isDefault;
 
     @Schema(name = "isTinyReserved", description = "是否tiny自有")
+    @TableField(value = "tiny_reserved")
     private Boolean isTinyReserved;
 
     @JsonProperty("component_metadata")
diff --git a/base/src/main/java/com/tinyengine/it/model/entity/ComponentLibrary.java b/base/src/main/java/com/tinyengine/it/model/entity/ComponentLibrary.java
index b9555f1f..97dbf40e 100644
--- a/base/src/main/java/com/tinyengine/it/model/entity/ComponentLibrary.java
+++ b/base/src/main/java/com/tinyengine/it/model/entity/ComponentLibrary.java
@@ -45,10 +45,12 @@ public class ComponentLibrary extends BaseEntity {
     private String name;
 
     @Schema(name = "appId", description = "关联应用id")
+    @TableField(value = "app_id")
     private Integer appId;
 
     @JsonProperty("package")
     @Schema(name = "package", description = "包名")
+    @TableField(value = "package")
     private String packageName;
 
     @Schema(name = "registry", description = "注册")
@@ -82,17 +84,22 @@ public class ComponentLibrary extends BaseEntity {
 
     @JsonProperty("public")
     @Schema(name = "public", description = "公开状态：0，1，2")
+    @TableField(value = "public")
     private Integer publicStatus;
 
     @Schema(name = "isStarted", description = "标识启用")
+    @TableField(value = "is_started")
     private Boolean isStarted;
 
     @Schema(name = "isOfficial", description = "标识官方组件")
+    @TableField(value = "is_official")
     private Boolean isOfficial;
 
     @Schema(name = "isDefault", description = "标识默认组件")
+    @TableField(value = "is_default")
     private Boolean isDefault;
 
     @Schema(name = "components", description = "组件库组件")
+    @TableField(exist = false)
     private List<Component> components;
 }
diff --git a/base/src/main/java/com/tinyengine/it/model/entity/PageHistory.java b/base/src/main/java/com/tinyengine/it/model/entity/PageHistory.java
index 903980b5..c3da95a1 100644
--- a/base/src/main/java/com/tinyengine/it/model/entity/PageHistory.java
+++ b/base/src/main/java/com/tinyengine/it/model/entity/PageHistory.java
@@ -52,12 +52,14 @@ public class PageHistory {
     private String name;
 
     @Schema(name = "page", description = "关联page表Id")
+    @TableField(value = "ref_id")
     private Integer page;
 
     @Schema(name = "version", description = "版本")
     private String version;
 
     @Schema(name = "app", description = "关联app表Id")
+    @TableField(value = "app_id")
     private Integer app;
 
     @Schema(name = "route", description = "页面路由")
@@ -74,6 +76,7 @@ public class PageHistory {
     @Schema(name = "parentId", description = "父文件夹id")
     private String parentId;
 
+    @TableField(value = "`group`")
     private String group;
 
     @Schema(name = "depth", description = "*页面/文件夹深度，更改层级时服务端校验用（校验可有可无）*")
diff --git a/base/src/main/java/com/tinyengine/it/model/entity/Tenant.java b/base/src/main/java/com/tinyengine/it/model/entity/Tenant.java
index c128102f..59b13606 100644
--- a/base/src/main/java/com/tinyengine/it/model/entity/Tenant.java
+++ b/base/src/main/java/com/tinyengine/it/model/entity/Tenant.java
@@ -40,7 +40,7 @@
 public class Tenant {
     @Schema(name = "id", description = "主键id")
     @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    private String id;
 
     @Schema(name = "nameCn", description = "组织唯一代码")
     private String orgCode;
diff --git a/base/src/main/resources/mappers/ComponentLibraryMapper.xml b/base/src/main/resources/mappers/ComponentLibraryMapper.xml
index 884c2a9c..5a3befb3 100644
--- a/base/src/main/resources/mappers/ComponentLibraryMapper.xml
+++ b/base/src/main/resources/mappers/ComponentLibraryMapper.xml
@@ -14,73 +14,73 @@
     <!-- 通用条件列 -->
     <sql id="ComponentLibraryByCondition">
         <if test="version!=null and version!=''">
-            AND version = #{version}
+            AND CL.version = #{version}
         </if>
         <if test="name!=null and name!=''">
-            AND `name` = #{name}
+            AND CL.`name` = #{name}
         </if>
         <if test="appId!=null">
-            AND app_id = #{appId}
+            AND CL.app_id = #{appId}
         </if>
         <if test="packageName!=null and packageName!=''">
-            AND package = #{packageName}
+            AND CL.package = #{packageName}
         </if>
         <if test="registry!=null and registry!=''">
-            AND registry = #{registry}
+            AND CL.registry = #{registry}
         </if>
         <if test="description!=null and description!=''">
-            AND description = #{description}
+            AND CL.description = #{description}
         </if>
         <if test="framework!=null and framework!=''">
-            AND framework = #{framework}
+            AND CL.framework = #{framework}
         </if>
         <if test="script!=null and script!=''">
-            AND script = #{script}
+            AND CL.script = #{script}
         </if>
         <if test="css!=null and css!=''">
-            AND css = #{css}
+            AND CL.css = #{css}
         </if>
         <if test="bundle!=null and bundle!=''">
-            AND bundle = #{bundle}
+            AND CL.bundle = #{bundle}
         </if>
         <if test="others!=null and others!=''">
-            AND `others` = #{others}
+            AND CL.`others` = #{others}
         </if>
         <if test="thumbnail!=null and thumbnail!=''">
-            AND thumbnail = #{thumbnail}
+            AND CL.thumbnail = #{thumbnail}
         </if>
         <if test="publicStatus!=null">
-            AND `public` = #{publicStatus}
+            AND CL.`public` = #{publicStatus}
         </if>
         <if test="isStarted!=null">
-            AND is_started = #{isStarted}
+            AND CL.is_started = #{isStarted}
         </if>
         <if test="isOfficial!=null">
-            AND is_official = #{isOfficial}
+            AND CL.is_official = #{isOfficial}
         </if>
         <if test="isDefault!=null">
-            AND is_default = #{isDefault}
+            AND CL.is_default = #{isDefault}
         </if>
         <if test="createdBy!=null and createdBy!=''">
-            AND created_by = #{createdBy}
+            AND CL.created_by = #{createdBy}
         </if>
         <if test="lastUpdatedBy!=null and lastUpdatedBy!=''">
-            AND last_updated_by = #{lastUpdatedBy}
+            AND CL.last_updated_by = #{lastUpdatedBy}
         </if>
         <if test="createdTime!=null">
-            AND created_time = #{createdTime}
+            AND CL.created_time = #{createdTime}
         </if>
         <if test="lastUpdatedTime!=null">
-            AND last_updated_time = #{lastUpdatedTime}
+            AND CL.last_updated_time = #{lastUpdatedTime}
         </if>
         <if test="tenantId!=null and tenantId!=''">
-            AND tenant_id = #{tenantId}
+            AND CL.tenant_id = #{tenantId}
         </if>
         <if test="renterId!=null and renterId!=''">
-            AND renter_id = #{renterId}
+            AND CL.renter_id = #{renterId}
         </if>
         <if test="siteId!=null and siteId!=''">
-            AND site_id = #{siteId}
+            AND CL.site_id = #{siteId}
         </if>
     </sql>
 
@@ -183,7 +183,7 @@
         <result column="tenant_id" property="tenantId"/>
         <result column="renter_id" property="renterId"/>
         <result column="site_id" property="siteId"/>
-        <collection  property="components" ofType="com.tinyengine.it.model.entity.Component">
+        <collection property="components" ofType="com.tinyengine.it.model.entity.Component">
             <id column="componentId" property="id"/>
             <result column="componentVersion" property="version"/>
             <result column="componentName" property="name"/>
@@ -218,145 +218,89 @@
             <result column="componentSiteId" property="siteId"/>
         </collection>
     </resultMap>
-
+    <sql id="componentLibrarySelectSql">
+        SELECT CL.id,
+               CL.version,
+               CL.`name`,
+               CL.app_id,
+               CL.package,
+               CL.registry,
+               CL.framework,
+               CL.description,
+               CL.script,
+               CL.css,
+               CL.bundle,
+               CL.dependencies,
+               CL.`others`,
+               CL.thumbnail,
+               CL.`public`,
+               CL.is_started,
+               CL.is_official,
+               CL.is_default,
+               CL.created_by,
+               CL.last_updated_by,
+               CL.created_time,
+               CL.last_updated_time,
+               CL.tenant_id,
+               CL.renter_id,
+               CL.site_id,
+               C.id AS componentId,
+               C.version AS componentVersion,
+               C.name AS componentName,
+               C.name_en,
+               C.icon,
+               C.description AS componentDescription,
+               C.doc_url,
+               C.screenshot,
+               C.tags,
+               C.keywords,
+               C.dev_mode,
+               C.npm,
+               C.`group`,
+               C.category,
+               C.priority,
+               C.snippets,
+               C.schema_fragment,
+               C.configure,
+               C.`public` AS componentPublic,
+               C.framework AS componentFramework,
+               C.is_official AS isOfficial,
+               C.is_default AS isDefault,
+               C.tiny_reserved,
+               C.component_metadata,
+               C.library_id,
+               C.created_by AS componentCreatedBy,
+               C.last_updated_by AS componentLastUpdatedBy,
+               C.created_time AS componentCreatedTime,
+               C.last_updated_time AS componentLastUpdatedTime,
+               C.tenant_id AS componentTenantId,
+               C.renter_id AS componentRenterId,
+               C.site_id AS componentSiteId
+        FROM t_component_library CL
+                 LEFT JOIN t_component C ON CL.id = C.library_id
+    </sql>
     <!-- 查询表t_component_library所有数据 -->
     <select id="queryAllComponentLibrary" resultMap="ComponentLibraryMap">
-        SELECT
-            CL.id,
-            CL.version,
-            CL.`name`,
-            CL.app_id,
-            CL.package,
-            CL.registry,
-            CL.framework,
-            CL.description,
-            CL.script,
-            CL.css,
-            CL.bundle,
-            CL.dependencies,
-            CL.`others`,
-            CL.thumbnail,
-            CL.`public`,
-            CL.is_started,
-            CL.is_official,
-            CL.is_default,
-            CL.created_by,
-            CL.last_updated_by,
-            CL.created_time,
-            CL.last_updated_time,
-            CL.tenant_id,
-            CL.renter_id,
-            CL.site_id,
-            C.id AS componentId,
-            C.version AS componentVersion,
-            C.name AS componentName,
-            C.name_en,
-            C.icon,
-            C.description AS componentDescription,
-            C.doc_url,
-            C.screenshot,
-            C.tags,
-            C.keywords,
-            C.dev_mode,
-            C.npm,
-            C.`group`,
-            C.category,
-            C.priority,
-            C.snippets,
-            C.schema_fragment,
-            C.configure,
-            C.`public` AS componentPublic,
-            C.framework AS componentFramework,
-            C.is_official AS isOfficial,
-            C.is_default AS isDefault,
-            C.tiny_reserved,
-            C.component_metadata,
-            C.library_id,
-            C.created_by AS componentCreatedBy,
-            C.last_updated_by AS componentLastUpdatedBy,
-            C.created_time AS componentCreatedTime,
-            C.last_updated_time AS componentLastUpdatedTime,
-            C.tenant_id AS componentTenantId,
-            C.renter_id AS componentRenterId,
-            C.site_id AS componentSiteId
-        FROM t_component_library CL
-        LEFT JOIN t_component C ON CL.id = C.library_id
-
+        <include refid="componentLibrarySelectSql"></include>
     </select>
 
     <!-- 根据主键id查询表t_component_library信息 -->
     <select id="queryComponentLibraryById" resultMap="ComponentLibraryMap">
-        SELECT
-        CL.id,
-        CL.version,
-        CL.`name`,
-        CL.app_id,
-        CL.package,
-        CL.registry,
-        CL.framework,
-        CL.description,
-        CL.script,
-        CL.css,
-        CL.bundle,
-        CL.dependencies,
-        CL.`others`,
-        CL.thumbnail,
-        CL.`public`,
-        CL.is_started,
-        CL.is_official,
-        CL.is_default,
-        CL.created_by,
-        CL.last_updated_by,
-        CL.created_time,
-        CL.last_updated_time,
-        CL.tenant_id,
-        CL.renter_id,
-        CL.site_id,
-        C.id AS componentId,
-        C.version AS componentVersion,
-        C.name AS componentName,
-        C.name_en,
-        C.icon,
-        C.description AS componentDescription,
-        C.doc_url,
-        C.screenshot,
-        C.tags,
-        C.keywords,
-        C.dev_mode,
-        C.npm,
-        C.`group`,
-        C.category,
-        C.priority,
-        C.snippets,
-        C.schema_fragment,
-        C.configure,
-        C.`public` AS componentPublic,
-        C.framework AS componentFramework,
-        C.is_official AS isOfficial,
-        C.is_default AS isDefault,
-        C.tiny_reserved,
-        C.component_metadata,
-        C.library_id,
-        C.created_by AS componentCreatedBy,
-        C.last_updated_by AS componentLastUpdatedBy,
-        C.created_time AS componentCreatedTime,
-        C.last_updated_time AS componentLastUpdatedTime,
-        C.tenant_id AS componentTenantId,
-        C.site_id AS componentSiteId
-        FROM t_component_library CL
-        LEFT JOIN t_component C ON CL.id = C.library_id
+        <include refid="componentLibrarySelectSql"></include>
         <where>
-            CL.id = #{id}
+            <if test="id != null">
+            AND CL.id = #{id}
+            </if>
         </where>
     </select>
 
     <!-- 根据条件查询表t_component_library数据 -->
     <select id="queryComponentLibraryByCondition" resultMap="ComponentLibraryMap">
-        SELECT
-        <include refid="Base_Column_List"/>
-        FROM t_component_library
-        WHERE 1=1
-        <include refid="ComponentLibraryByCondition"/>
+        <include refid="componentLibrarySelectSql"></include>
+        <where>
+            <include refid="ComponentLibraryByCondition"/>
+        </where>
+
     </select>
 
     <!-- 根据主键id删除表t_component_library数据 -->
diff --git a/base/src/test/java/com/tinyengine/it/controller/PageControllerTest.java b/base/src/test/java/com/tinyengine/it/controller/PageControllerTest.java
index 403c8e34..effc7f5c 100644
--- a/base/src/test/java/com/tinyengine/it/controller/PageControllerTest.java
+++ b/base/src/test/java/com/tinyengine/it/controller/PageControllerTest.java
@@ -71,10 +71,13 @@ void testGetPageById() throws Exception {
     @Test
     void testCreatePage() throws Exception {
         when(pageService.createPage(any(Page.class))).thenReturn(new Result<Page>());
-
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        String json = "{\"isPage\":true}";
+        request.setContent(json.getBytes(StandardCharsets.UTF_8)); // 设置请求体
+        request.setContentType("application/json");
         Page page = new Page();
         page.setIsPage(true);
-        Result<Page> result = pageController.createPage(page);
+        Result<Page> result = pageController.createPage(request);
         Assertions.assertNull(result.getData());
     }