From 3f1d871318231ebabb3be06c4ca2ca770b5b0220 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 19 三月 2026 09:59:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_kthg' into dev_New_kthg
---
src/main/java/com/ruoyi/sales/pojo/CommonFile.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/CommonFile.java b/src/main/java/com/ruoyi/sales/pojo/CommonFile.java
index 77e8b7d..16c12aa 100644
--- a/src/main/java/com/ruoyi/sales/pojo/CommonFile.java
+++ b/src/main/java/com/ruoyi/sales/pojo/CommonFile.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
+import java.io.Serializable;
import java.time.LocalDateTime;
/**
@@ -11,7 +12,7 @@
@Data
@TableName("common_file")
-public class CommonFile {
+public class CommonFile implements Serializable {
private static final long serialVersionUID = 1L;
@@ -28,7 +29,7 @@
private String url;
/** 鍏宠仈琛� */
- private String type;
+ private Integer type;
/** 鍒涘缓鏃堕棿 */
@TableField(fill = FieldFill.INSERT)
--
Gitblit v1.9.3