| 
					
				 | 
			
			
				@@ -13,6 +13,7 @@ package com.yami.shop.platform.controller; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.baomidou.mybatisplus.core.metadata.IPage; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.yami.shop.bean.model.User; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.yami.shop.common.util.PageParam; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import com.yami.shop.common.util.R; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.yami.shop.common.util.RedisUtil; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.yami.shop.security.comment.constants.SecurityConstants; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.yami.shop.security.comment.enums.App; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -72,10 +73,10 @@ public class UserController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @GetMapping("/info/{userId}") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     @PreAuthorize("@pms.hasPermission('plateform:user:info')") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public ResponseEntity<User> info(@PathVariable("userId") String userId) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public R<User> info(@PathVariable("userId") String userId) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         User user = userService.getById(userId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         user.setNickName(user.getNickName()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        return ResponseEntity.ok(user); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        return R.SUCCESS(user); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     /** 
			 |