From cd33cd66aea3cfbded96151ab78ccc58a4072171 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期五, 18 三月 2022 20:53:26 +0800 Subject: [PATCH] !158 修复demo模块字段类型错误问题 Merge pull request !158 from KonBAI/demo_field_type --- ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 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 3c6d23e..1f34f9c 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,25 +2,24 @@ 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 lombok.experimental.Accessors; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** * 娴嬭瘯鏁版嵁鑴辨晱鎺у埗鍣� - * + * <p> * 榛樿绠$悊鍛樹笉杩囨护 * 闇�鑷鏍规嵁涓氬姟閲嶅啓瀹炵幇 * - * @see com.ruoyi.common.core.service.SensitiveService * @author Lion Li * @version 3.6.0 + * @see com.ruoyi.common.core.service.SensitiveService */ @Api(value = "娴嬭瘯鏁版嵁鑴辨晱鎺у埗鍣�", tags = {"娴嬭瘯鏁版嵁鑴辨晱绠$悊"}) @RestController @@ -32,18 +31,17 @@ */ @ApiOperation("鏌ヨ娴嬭瘯鍗曡〃鍒楄〃") @GetMapping("/test") - public AjaxResult<TestSensitive> test() { - TestSensitive testSensitive = new TestSensitive() - .setIdCard("210397198608215431") - .setPhone("17640125371") - .setAddress("鍖椾含甯傛湞闃冲尯鏌愭煇鍥涘悎闄�1203瀹�") - .setEmail("17640125371@163.com") - .setBankCard("6226456952351452853"); - return AjaxResult.success(testSensitive); + 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 R.ok(testSensitive); } @Data - @Accessors(chain = true) static class TestSensitive { /** -- Gitblit v1.9.3