From 290e5fd2e74efe19326f56e38c3391aaae23ffc5 Mon Sep 17 00:00:00 2001
From: IZCD4L12RTSW0VZ\Administrator <skyouc>
Date: 星期三, 24 十二月 2025 17:14:09 +0800
Subject: [PATCH] Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms
---
src/main/java/com/zy/api/entity/dto/XSR.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/api/entity/dto/XSR.java b/src/main/java/com/zy/api/entity/dto/XSR.java
index d241e06..842a586 100644
--- a/src/main/java/com/zy/api/entity/dto/XSR.java
+++ b/src/main/java/com/zy/api/entity/dto/XSR.java
@@ -10,7 +10,7 @@
@Data
@Accessors(chain = true)
-@ApiModel(value = "BaseResponse", description = "鍩虹鍝嶅簲")
+@ApiModel(value = "XSR", description = "鍩虹鍝嶅簲")
public class XSR<T> {
private static final String SUCCESS_CODE = "200";
private static final String FAIL_CODE = "500";
@@ -23,7 +23,7 @@
private String returnMessage;
- private T data;
+ private T result;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@@ -47,7 +47,7 @@
.setSuccess(true)
.setMessage("鎿嶄綔鎴愬姛")
.setReturnMessage("鎿嶄綔鎴愬姛")
- .setData(data);
+ .setResult(data);
}
public static <T> XSR<T> ok(T data, String message) {
@@ -56,7 +56,7 @@
.setSuccess(true)
.setMessage(message)
.setReturnMessage(message)
- .setData(data);
+ .setResult(data);
}
public static <T> XSR<T> error(String message) {
--
Gitblit v1.9.1