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/GunController.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/springblade/modules/equipage/controller/GunController.java b/src/main/java/org/springblade/modules/equipage/controller/GunController.java
index 97c033a..b1c7658 100644
--- a/src/main/java/org/springblade/modules/equipage/controller/GunController.java
+++ b/src/main/java/org/springblade/modules/equipage/controller/GunController.java
@@ -62,10 +62,10 @@
 	 */
 	@PostMapping("/submit")
 	public R submit(@RequestBody Gun gun) throws Exception {
-		if (gun.getId()==null){
-			arg arg = new arg();
-			arg.test01(arg.url+"/gun/save",gun);
-		}
+//		if (gun.getId()==null){
+//			arg arg = new arg();
+//			arg.test01(arg.url+"/gun/save",gun);
+//		}
 		return R.status(gunService.saveOrUpdate(gun));
 	}
 
@@ -75,7 +75,7 @@
 	 */
 	@PostMapping("/remove")
 	public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
-		arg.sendPostRemoveByIds(arg.url+"/gun/remove",ids);
+		//arg.sendPostRemoveByIds(arg.url+"/gun/remove",ids);
 		return R.status(gunService.removeByIds(Func.toLongList(ids)));
 	}
 

--
Gitblit v1.9.3