From d06ef3f44d6dc19dae223ab420165369ea13cc16 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 20 五月 2026 16:29:35 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/project/system/controller/SysUserClientController.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysUserClientController.java b/src/main/java/com/ruoyi/project/system/controller/SysUserClientController.java
index cb921a0..f6a2732 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysUserClientController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysUserClientController.java
@@ -2,15 +2,13 @@
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.project.system.domain.GetuiConfig;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.project.system.domain.SysUserClient;
import com.ruoyi.project.system.service.SysUserClientService;
import com.ruoyi.common.utils.SecurityUtils;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -36,10 +34,10 @@
*/
@PostMapping("/addOrUpdateClientId")
@Operation(summary = "娣诲姞/鏇存柊鐢ㄦ埛cid")
- public AjaxResult addOrUpdateClientId(@RequestBody SysUserClient sysUserClient) {
+ public R<?> addOrUpdateClientId(@RequestBody SysUserClient sysUserClient) {
Long userId = SecurityUtils.getUserId();
sysUserClient.setUserId(userId);
boolean result = sysUserClientService.addOrUpdateClientId(sysUserClient);
- return result ? success() : error("璁惧缁戝畾澶辫触");
+ return result ? R.ok() : R.fail("璁惧缁戝畾澶辫触");
}
}
\ No newline at end of file
--
Gitblit v1.9.3