From 02dbaaa04bc443e860a715cf907bc0fb5c1a7da4 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 11 七月 2023 09:09:34 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/AttributeController.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/AttributeController.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/AttributeController.java
index c03805d..90674ee 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/AttributeController.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/AttributeController.java
@@ -95,8 +95,8 @@
 
 	@GetMapping("/query-page")
 	@ApiImplicitParams({
-		@ApiImplicitParam(name = "key",value = "灞炴�у悕妯$硦",paramType = "query",dataType = "string"),
-		@ApiImplicitParam(name = "notIn",value = "灞炴�у悕鎺掗櫎",paramType = "query",dataType = "string")
+		@ApiImplicitParam(name = "key",value = "灞炴�х紪鍙锋ā绯�",paramType = "query",dataType = "string"),
+		@ApiImplicitParam(name = "notIn",value = "灞炴�х紪鍙锋帓闄�",paramType = "query",dataType = "string")
 	})
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "鏌ヨ鍒楄〃",notes = "浼犲叆鏌ョ殑鍊煎拰涓嶆煡鐨勫��")
@@ -127,22 +127,22 @@
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "鏂板鎴栦慨鏀�", notes = "浼犲叆鍏冩暟鎹璞�")
-	public R submit(@Valid @RequestBody AttributeDTO dto) {
+	public R submit(@RequestBody AttributeDTO dto) {
 		CacheUtil.clear(OmdCacheConstant.ATTR_CACHE);
 		return R.status(attributeService.submit(dto));
 	}
 
 	/**
 	 * 鍒犻櫎
-	 * @param ids 涓婚敭闆嗗悎
+	 * @param oid 涓婚敭闆嗗悎
 	 * @return 鎵ц缁撴灉
 	 */
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 4)
 	@ApiOperation(value = "鍒犻櫎", notes = "涓婚敭闆嗗悎")
-	public R remove(@ApiParam(value = "涓婚敭闆嗗悎", required = true) @RequestParam String ids) {
+	public R remove(@ApiParam(value = "涓婚敭闆嗗悎", required = true) @RequestParam String oid) {
 		CacheUtil.clear(OmdCacheConstant.ATTR_CACHE);
-		return R.status(attributeService.removeAttrs(ids));
+		return attributeService.remove(oid);
 	}
 
 	/**

--
Gitblit v1.9.3