From 74d1c21ebb6b3b916904d95d13d289df23dcdedd Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 20 Aug 2024 18:06:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/common/model/ResponseResult.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/dji/sample/common/model/ResponseResult.java b/src/main/java/com/dji/sample/common/model/ResponseResult.java
index dca4c19..2317e93 100644
--- a/src/main/java/com/dji/sample/common/model/ResponseResult.java
+++ b/src/main/java/com/dji/sample/common/model/ResponseResult.java
@@ -48,7 +48,7 @@
.build();
}
- public static<T> ResponseResult success(int code, String message,String traceid,T data) {
+ public static<T> ResponseResult success(int code, String message,T data,String traceid) {
return ResponseResult.builder()
.code(code)
.data(data)
--
Gitblit v1.9.3