From 2304d7b140c5c5b4bf3a83f9ced8bff37d20c42e Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期日, 28 九月 2025 16:45:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/services/src/main/java/com/doumee/api/common/PublicCloudController.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/api/common/PublicCloudController.java b/server/services/src/main/java/com/doumee/api/common/PublicCloudController.java
index 738848c..f4addb1 100644
--- a/server/services/src/main/java/com/doumee/api/common/PublicCloudController.java
+++ b/server/services/src/main/java/com/doumee/api/common/PublicCloudController.java
@@ -61,7 +61,7 @@
     })
     @PostMapping(value = "/upload", headers = "content-type=multipart/form-data")
     @ResponseBody
-    public void upload(HttpServletRequest request, HttpServletResponse response, String folder) throws Exception {
+    public void upload(HttpServletRequest request, HttpServletResponse response, String folder,String flag) throws Exception {
         Date d1 = new Date();
         log.error("鎬诲緱涓婁紶鏂囦欢鎴愬姛=============寮�濮�========="+DateUtil.getPlusTime2(d1));
         if(Objects.isNull(folder)){
@@ -105,6 +105,7 @@
                         fileJSON.put("imgaddr", fName);
                         fileJSON.put("imgname", fileName);
                         fileJSON.put("originname", originname);
+                        fileJSON.put("flag", flag);
                         context.put("data",fileJSON);
                         context.put("message","璇锋眰鎴愬姛");
                         writerJson(response, context);

--
Gitblit v1.9.3