From 73ca1aebdc6b577b709a76706ead39e3bd63fc5d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 04 七月 2025 11:10:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/api/business/CarouselController.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/server/src/main/java/com/doumee/api/business/CarouselController.java b/server/src/main/java/com/doumee/api/business/CarouselController.java
index 9971d0d..01e332f 100644
--- a/server/src/main/java/com/doumee/api/business/CarouselController.java
+++ b/server/src/main/java/com/doumee/api/business/CarouselController.java
@@ -1,8 +1,11 @@
package com.doumee.api.business;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.doumee.api.BaseController;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.constants.Constants;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
@@ -17,6 +20,9 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@@ -108,11 +114,12 @@
return ApiResponse.success(carouselService.getFoodDataVO());
}
- @ApiOperation("鑾峰彇foot閰嶇疆")
- @PostMapping("/updFoodDataVO")
- public ApiResponse<FootDataVO> updFoodDataVO(@RequestBody FootDataDTO footDataDTO) {
+ @ApiOperation("鏇存柊foot閰嶇疆")
+ @PostMapping("/updFoodData")
+ public ApiResponse<FootDataVO> updFoodData(@RequestBody FootDataDTO footDataDTO) {
carouselService.updFoodDataVO(footDataDTO);
return ApiResponse.success(null);
}
+
}
--
Gitblit v1.9.3