Merge branch 'main' of http://carsafe.uicp.cn/toolchaintechnologycenter/spdm-backend

# Conflicts:
#	data/src/test/resources/application-test.yml

common/src/main/java/com/sdm/common/entity/resp/BaseResp.java

@@ -1,5 +1,6 @@
 package com.sdm.common.entity.resp;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -51,4 +52,8 @@ public class BaseResp {
 
     @Schema(description = "所属算列id")
     private String ownRunId;
+
+    @Schema(description= "文件业务类型（1：模型文件 2：仿真报告、3：计算文件、4：曲线文件、5：云图文件，6：网格文件，7：计算过程文件）")
+    @TableField("fileType")
+    private Integer fileType;
 }

data/src/test/resources/application-test.yml

@@ -4,7 +4,7 @@ spring:
   datasource:
     username: spdm
     password: Spdm@2026
-    jdbc-url: jdbc:postgresql://192.168.65.161:25432/spdm_baseline?currentSchema=public&stringtype=unspecified
+    jdbc-url: jdbc:postgresql://192.168.65.161:25432/spdm_baseline?currentSchema=public&stringtype=unspecified&TimeZone=Asia/Shanghai
     driver-class-name: org.postgresql.Driver
     hikari:
       # 设置连接池能够容纳的最大连接数。建议值：CPU核心数 * 2 + 有效磁盘I/O数。一个常见的经验值是 10-20。
@@ -20,7 +20,7 @@ spring:
     master:
       username: spdm
       password: Spdm@2026
-      jdbc-url: jdbc:postgresql://192.168.65.161:25432/spdm_baseline?currentSchema=public&stringtype=unspecified
+      jdbc-url: jdbc:postgresql://192.168.65.161:25432/spdm_baseline?currentSchema=public&stringtype=unspecified&TimeZone=Asia/Shanghai
       driver-class-name: org.postgresql.Driver
     slave:
       username: root