Merge branch 'dev_xq_0.0.1' of http://web.ronyao.com:3000/RYTEC/Real-time-monitoring into dev_xq_0.0.1

# Conflicts:
#	sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/CanvasCfgDO.java
#	sz-service/sz-service-admin/src/main/resources/db/changelog/sql/dev_0.0.1_xq.sql

config/local/mysql.yml

@@ -1,7 +1,7 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:13306/sz_admin_preview?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://127.0.0.1:3306/sz_admin_preview?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false&allowPublicKeyRetrieval=true
     username: root
     password: 123456
     hikari:

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/CanvasCfgDO.java

@@ -18,7 +18,7 @@ import lombok.NoArgsConstructor;
  * @author xq
  * @date 2026/1/29 11:32
  */
-@Table("canvas_cfg")
+@Table("ry_model_content")
 @Schema(description = "画布配置数据对象")
 @Data
 @Builder

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/FileStorageDO.java

@@ -16,7 +16,7 @@ import java.util.Date;
  * @description:文件存储数据对象
  * @date 2026/2/2 22:18
  */
-@Table("file_storage")
+@Table("ry_file_storage")
 @Schema(description = "文件存储数据对象")
 @Data
 @Builder

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/GridCfgDO.java

@@ -17,7 +17,7 @@ import lombok.NoArgsConstructor;
  * @author xq
  * @date 2026/1/29 11:35
  */
-@Table("grid_cfg")
+@Table("ry_grid_cfg")
 @Schema(description = "存储网格的基本配置信息")
 @Data
 @Builder

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/ModelContentDO.java

@@ -21,7 +21,7 @@ import java.util.HashMap;
  * @author xq
  * @version 1.0
  */
-@Table("model_content")
+@Table("ry_model_content")
 @Schema(description = "存储模型的基本信息和配置")
 @Data
 @NoArgsConstructor

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/UserModelContentDO.java

@@ -16,7 +16,7 @@ import java.io.Serializable;
  * @author xq
  * @version 1.0
  */
-@Table("user_model_content")
+@Table("ry_user_model_content")
 @Schema(description = "用户模型中间表")
 @Data
 @Builder

sz-service/sz-service-admin/src/main/resources/db/changelog/sql/dev_0.0.1_xq.sql

@@ -7,7 +7,6 @@ create table ry_user_model_content
 ) comment '用户模型关系';
 
 
--- auto-generated definition
 create table ry_model_content
 (
     id                varchar(32)  not null comment '模型id'
@@ -28,7 +27,6 @@ create table ry_model_content
     comment '模型内容';
 
 
-
 create table ry_canvas_cfg
 (
     id               varchar(32) not null comment '面板id'  primary key,