From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-common/src/main/java/com/ruoyi/common/config/FileUploadConfig.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/FileUploadConfig.java b/ruoyi-common/src/main/java/com/ruoyi/common/config/FileUploadConfig.java
index 3a8b0ed..32c0b2a 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/config/FileUploadConfig.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/config/FileUploadConfig.java
@@ -18,4 +18,6 @@
private String allowExt;
private String location;
private String qrLocation;
+ private String fileUrlPrefix;
+
}
--
Gitblit v1.7.1