!8 sync 同步ruoyi-vue-plus更新

fix -- 修复代码生成页面错误bug
fix -- 调整返回类型为R，修正脚本

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java

@@ -2,25 +2,24 @@ package com.ruoyi.demo.controller;
 
 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 @@ public class TestSensitiveController extends BaseController {
      */
     @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 {
 
         /**