diff --git a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/controller/DataModelController.java b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/controller/DataModelController.java
new file mode 100644
index 0000000..eca1a0e
--- /dev/null
+++ b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/controller/DataModelController.java
@@ -0,0 +1,49 @@
+package com.sz.admin.monitor.controller;
+
+
+import com.sz.admin.monitor.pojo.dto.dataModel.DataModelDTO;
+import com.sz.admin.monitor.pojo.que.dataModel.DataModelQue;
+import com.sz.admin.monitor.service.impl.DataModelServiceImpl;
+import com.sz.core.common.entity.ApiResult;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author xq
+ * @description:
+ * @date 2026/3/14 12:35
+ */
+@Slf4j
+@RestController
+@RequestMapping("/data/model")
+public class DataModelController {
+    @Autowired
+    private DataModelServiceImpl dataModelService;
+
+    @PostMapping("/getModelData")
+    public ApiResult<DataModelDTO> getModelData(@RequestBody DataModelQue que) {
+        return dataModelService.getModelData(que);
+    }
+
+    /**
+     * 保存或者更新数据模型
+     *
+     * @param dataModelDTO
+     * @return
+     */
+    @PostMapping("/saveOrUpdate/modelData")
+    public ApiResult saveOrUpdateModelData(
+        @RequestBody DataModelDTO dataModelDTO,
+        HttpServletRequest request,
+        HttpServletResponse response) {
+        return dataModelService.saveOrUpdateModelData(dataModelDTO, request, response);
+    }
+
+    @GetMapping("/test")
+    public ApiResult test() {
+        return ApiResult.success(dataModelService.getList());
+    }
+}
diff --git a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/CanvasCfgDO.java b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/CanvasCfgDO.java
index c83878f..424e6ab 100644
--- a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/CanvasCfgDO.java
+++ b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/CanvasCfgDO.java
@@ -2,6 +2,8 @@ package com.sz.admin.monitor.pojo.po;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
 import com.sz.admin.monitor.pojo.dto.dataModel.CanvasCfgDTO;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -16,7 +18,7 @@ import lombok.NoArgsConstructor;
  * @author xq
  * @date 2026/1/29 11:32
  */
-@Table("model_content")
+@Table("canvas_cfg")
 @Schema(description = "画布配置数据对象")
 @Data
 @Builder
@@ -26,6 +28,7 @@ public class CanvasCfgDO {
     /**
      * 面板id
      */
+    @Id(keyType = KeyType.Generator, value = "uuid")
     @Schema(description = "面板id")
     private String id;
 
diff --git a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/GridCfgDO.java b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/GridCfgDO.java
index f8e1135..02f0ee9 100644
--- a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/GridCfgDO.java
+++ b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/GridCfgDO.java
@@ -1,6 +1,8 @@
 package com.sz.admin.monitor.pojo.po;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
 import com.sz.admin.monitor.pojo.dto.dataModel.GridCfgDTO;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -25,31 +27,32 @@ public class GridCfgDO {
     /**
      * 网格id
      */
+    @Id(keyType = KeyType.Generator, value = "uuid")
     @Schema(description = "主键ID")
     private String id;
 
     /**
      * 用户id
      */
-    @Schema(description = "主键ID")
+    @Schema(description = "用户id")
     private String userId;
 
     /**
      * 网格是否启用
      */
-    @Schema(description = "主键ID")
+    @Schema(description = "网格是否启用")
     private Boolean enabled;
 
     /**
      * 对齐
      */
-    @Schema(description = "主键ID")
+    @Schema(description = "对齐")
     private Boolean align;
 
     /**
      * 大小
      */
-    @Schema(description = "主键ID")
+    @Schema(description = "大小")
     private Integer size;
 
     /**
diff --git a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/ModelContentDO.java b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/ModelContentDO.java
index 3c3c31a..1982fad 100644
--- a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/ModelContentDO.java
+++ b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/ModelContentDO.java
@@ -3,6 +3,8 @@ package com.sz.admin.monitor.pojo.po;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
 import com.sz.admin.monitor.pojo.dto.dataModel.ModelContentDTO;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -28,6 +30,7 @@ public class ModelContentDO {
     /**
      * 模型id
      */
+    @Id(keyType = KeyType.Generator, value = "uuid")
     @Schema(description = "模型id")
     private String id;
 
diff --git a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/UserModelContentDO.java b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/UserModelContentDO.java
index eae82f5..473ec27 100644
--- a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/UserModelContentDO.java
+++ b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/UserModelContentDO.java
@@ -1,5 +1,7 @@
 package com.sz.admin.monitor.pojo.po;
 
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
@@ -22,8 +24,9 @@ import java.io.Serializable;
 @AllArgsConstructor
 public class UserModelContentDO implements Serializable {
     /**
-     * 表id
+     * id
      */
+    @Id(keyType = KeyType.Generator, value = "uuid")
     @Schema(description = "主键ID")
     private String id;
     /**
diff --git a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/CanvasCfgServiceImpl.java b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/CanvasCfgServiceImpl.java
index 4bebe64..c3bda89 100644
--- a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/CanvasCfgServiceImpl.java
+++ b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/CanvasCfgServiceImpl.java
@@ -31,8 +31,9 @@ public class CanvasCfgServiceImpl extends ServiceImpl<CanvasCfgMapper, CanvasCfg
         QueryWrapper queryWrapper = QueryWrapper
             .create()
             .from(CanvasCfgDO.class)
-            .where(CanvasCfgDO.USER_ID, canvasCfgDTO.getUserId())
+            .eq(CanvasCfgDO.USER_ID, canvasCfgDTO.getUserId())
             .limit(1);
+
         CanvasCfgDO one = getOne(queryWrapper);
 
 //        CanvasCfgDO one = getOne(new QueryWrapper<CanvasCfgDO>()
diff --git a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/DataModelServiceImpl.java b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/DataModelServiceImpl.java
index 41a1afb..ae4c55b 100644
--- a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/DataModelServiceImpl.java
+++ b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/DataModelServiceImpl.java
@@ -58,7 +58,7 @@ public class DataModelServiceImpl {
 
         QueryWrapper queryWrapper = QueryWrapper.create()
             .from(CanvasCfgDO.class)
-            .where(CanvasCfgDO.USER_ID, que.getUserId())
+            .eq(CanvasCfgDO.USER_ID, que.getUserId())
             .limit(1);
 
         // 获取画板数据
@@ -76,7 +76,7 @@ public class DataModelServiceImpl {
         // 获取网格数据
         GridCfgDO gridCfgDO = gridCfgService.getOne(QueryWrapper.create()
             .from(GridCfgDO.class)
-            .where(GridCfgDO.USER_ID, que.getUserId())
+            .eq(GridCfgDO.USER_ID, que.getUserId())
             .limit(1)
         );
 //        GridCfgDO gridCfgDO = gridCfgService.getOne(new QueryWrapper<GridCfgDO>()
@@ -91,8 +91,8 @@ public class DataModelServiceImpl {
         //中间表
         List<UserModelContentDO> userModelList = userModelContentService.list(QueryWrapper.create()
             .from(UserModelContentDO.class)
-            .where(UserModelContentDO.USER_ID, userId)
-            .limit(1)
+            .eq(UserModelContentDO.USER_ID, userId)
+            .eq(UserModelContentDO.MENU_TYPE, que.getMenuType())
         );
 //        List<UserModelContentDO> userModelList = userModelContentService.list(new QueryWrapper<UserModelContentDO>()
 //            .eq(UserModelContentDO.USER_ID, userId)
@@ -191,7 +191,7 @@ public class DataModelServiceImpl {
         //获取中间表
         List<UserModelContentDO> list = userModelContentService.list(QueryWrapper.create()
             .from(UserModelContentDO.class)
-            .where(UserModelContentDO.USER_ID, userId) //先写死
+            .eq(UserModelContentDO.USER_ID, userId) //先写死
             .eq(UserModelContentDO.MENU_TYPE, dataModelDTO.getMenuType())
         );
 //        List<UserModelContentDO> list = userModelContentService.list(new QueryWrapper<UserModelContentDO>()
@@ -207,7 +207,7 @@ public class DataModelServiceImpl {
 
             userModelContentService.remove(QueryWrapper.create()
                 .from(UserModelContentDO.class)
-                .where(UserModelContentDO.USER_ID, userId)
+                .eq(UserModelContentDO.USER_ID, userId)
                 .eq(UserModelContentDO.MENU_TYPE, dataModelDTO.getMenuType()));
 
 
diff --git a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/GridCfgServiceImpl.java b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/GridCfgServiceImpl.java
index 676b023..106f25a 100644
--- a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/GridCfgServiceImpl.java
+++ b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/GridCfgServiceImpl.java
@@ -30,7 +30,7 @@ public class GridCfgServiceImpl extends ServiceImpl<GridCfgMapper, GridCfgDO> im
 
         QueryWrapper queryWrapper = QueryWrapper.create()
             .from(GridCfgDO.class)
-            .where(GridCfgDO.USER_ID, gridCfgDO.getUserId())
+            .eq(GridCfgDO.USER_ID, gridCfgDO.getUserId())
             .limit(1);
 
         GridCfgDO one = getOne(queryWrapper);
diff --git a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/ModelContentServiceImpl.java b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/ModelContentServiceImpl.java
index dc74c20..80ce157 100644
--- a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/ModelContentServiceImpl.java
+++ b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/ModelContentServiceImpl.java
@@ -53,7 +53,7 @@ public class ModelContentServiceImpl extends ServiceImpl<ModelContentMapper, Mod
                 QueryWrapper queryWrapper = QueryWrapper.create()
                     .select()
                     .from(UserModelContentDO.class)
-                    .where(UserModelContentDO.MODEL_CONTENT_ID, modelContentDO.getId())
+                    .eq(UserModelContentDO.MODEL_CONTENT_ID, modelContentDO.getId())
                     .eq(UserModelContentDO.MENU_TYPE, menuType)
                     //true:ASC   false:DESC
                     .orderBy(UserModelContentDO.ID, false)
diff --git a/sz-service/sz-service-admin/src/main/resources/db/changelog/sql/dev_0.0.1_xq.sql b/sz-service/sz-service-admin/src/main/resources/db/changelog/sql/dev_0.0.1_xq.sql
index 2561ad7..75f0a11 100644
--- a/sz-service/sz-service-admin/src/main/resources/db/changelog/sql/dev_0.0.1_xq.sql
+++ b/sz-service/sz-service-admin/src/main/resources/db/changelog/sql/dev_0.0.1_xq.sql
@@ -1,4 +1,4 @@
-create table user_model_content
+create table ry_user_model_content
 (
     id               varchar(32) null comment '表id',
     user_id          varchar(32) null comment '用户id',
@@ -7,24 +7,29 @@ create table user_model_content
 ) comment '用户模型关系';
 
 
-create table model_content
+-- auto-generated definition
+create table ry_model_content
 (
-    id                varchar(32) not null comment '模型id'
+    id                varchar(32)  not null comment '模型id'
         primary key,
-    title             varchar(32) null comment '模型名称',
-    type              varchar(32) null comment '模型类型',
+    title             varchar(32)  null comment '模型名称',
+    type              varchar(32)  null comment '模型类型',
     binfo             varchar(128) null comment '位置（json）',
-    resize            tinyint(1)   null comment '调整大小(bool)',
-    rotate            tinyint(1)   null comment '锁定(bool)',
+    resize            tinyint(1)   null comment '调整大小',
+    rotate            tinyint(1)   null comment '旋转',
+    `lock`            tinyint(1)   null comment '锁定',
     active            tinyint(1)   null comment '动作(bool)',
     hide              tinyint(1)   null comment '隐藏(bool)',
     props             varchar(128) null comment '属性(json)',
     tag               varchar(128) null comment 'vue组件名称',
     common_animations varchar(128) null comment '动画(json)',
     events            varchar(128) null comment '事件'
-) comment '模型内容';
+)
+    comment '模型内容';
+
+
 
-create table canvas_cfg
+create table ry_canvas_cfg
 (
     id               varchar(32) not null comment '面板id'  primary key,
     user_id          varchar(32) null comment '用户id',
@@ -40,7 +45,7 @@ create table canvas_cfg
     drag_offset      text null comment '拖拽(json)'
 ) comment '面板';
 
-create table grid_cfg
+create table ry_grid_cfg
 (
     id      varchar(32) not null
         primary key,
@@ -51,7 +56,7 @@ create table grid_cfg
 ) comment '网格';
 
 -- auto-generated definition
-create table file_storage
+create table ry_file_storage
 (
     id          varchar(32)  not null
         primary key,