From 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 19 Aug 2021 15:03:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/equipage/controller/CarController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/equipage/controller/CarController.java b/src/main/java/org/springblade/modules/equipage/controller/CarController.java
index 821593d..5c94736 100644
--- a/src/main/java/org/springblade/modules/equipage/controller/CarController.java
+++ b/src/main/java/org/springblade/modules/equipage/controller/CarController.java
@@ -5,6 +5,7 @@
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import org.springblade.common.utils.arg;
+import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
@@ -13,6 +14,10 @@
import org.springblade.modules.equipage.service.CarService;
import org.springblade.modules.equipage.vo.CarVo;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
/**
* @author zhongrj
@@ -62,10 +67,10 @@
*/
@PostMapping("/submit")
public R submit(@RequestBody Car car) throws Exception {
- if (car.getId()==null){
+ /*if (car.getId()==null){
arg arg = new arg();
arg.test01(arg.url+"/car/save",car);
- }
+ }*/
return R.status(carService.saveOrUpdate(car));
}
@@ -75,6 +80,7 @@
*/
@PostMapping("/remove")
public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
+ //arg.sendPostRemoveByIds(arg.url+"/car/remove",ids);
return R.status(carService.removeByIds(Func.toLongList(ids)));
}
--
Gitblit v1.9.3