From 56050aa6501f3d9d2f79a2c40a28815878ac56ee Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期四, 24 十一月 2022 15:14:47 +0800 Subject: [PATCH] update 同步 ruoyi 相关提交 * fix 修复Log注解GET请求记录不到参数问题 * fix 修复某些特性的环境生成代码变乱码TXT文件问题 * update 消除Vue3控制台出现的警告信息 * fix 开启TopNav没有子菜单隐藏侧边栏 * fix 修复回显数据字典数组异常问题(I60UYQ) * update 忽略不必要的属性数据返回 --- ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java index 4deb2c0..6bf904c 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java @@ -2,10 +2,8 @@ import com.ruoyi.common.annotation.Sensitive; import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.R; import com.ruoyi.common.enums.SensitiveStrategy; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.Data; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -21,7 +19,6 @@ * @version 3.6.0 * @see com.ruoyi.common.core.service.SensitiveService */ -@Api(value = "娴嬭瘯鏁版嵁鑴辨晱鎺у埗鍣�", tags = {"娴嬭瘯鏁版嵁鑴辨晱绠$悊"}) @RestController @RequestMapping("/demo/sensitive") public class TestSensitiveController extends BaseController { @@ -29,16 +26,15 @@ /** * 娴嬭瘯鏁版嵁鑴辨晱 */ - @ApiOperation("鏌ヨ娴嬭瘯鍗曡〃鍒楄〃") @GetMapping("/test") - public AjaxResult<TestSensitive> test() { + public R<TestSensitive> test() { TestSensitive testSensitive = new TestSensitive(); testSensitive.setIdCard("210397198608215431"); testSensitive.setPhone("17640125371"); testSensitive.setAddress("鍖椾含甯傛湞闃冲尯鏌愭煇鍥涘悎闄�1203瀹�"); testSensitive.setEmail("17640125371@163.com"); testSensitive.setBankCard("6226456952351452853"); - return AjaxResult.success(testSensitive); + return R.ok(testSensitive); } @Data -- Gitblit v1.9.3