From 0f4459e4201fdc19185b7dd03215871f036acd70 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 28 五月 2025 16:45:01 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/BaseResult.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/BaseResult.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/BaseResult.java
index 0a94794..081644b 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/BaseResult.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/BaseResult.java
@@ -1,5 +1,7 @@
package com.ruoyi.integration.drainage.model;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.ruoyi.other.api.domain.Operator;
import lombok.Data;
import javax.validation.constraints.NotNull;
@@ -10,7 +12,7 @@
* @Date 2025/1/21 15:54
*/
@Data
-public class BaseResult<T> {
+public class BaseResult extends BaseModel {
/**
* 参数编码
* -1：系统繁忙，此时请求方稍后重试
@@ -22,20 +24,23 @@
* 500：系统错误
*/
@NotNull
- private Integer Ret;
+ @JsonProperty("Ret")
+ private Integer ret;
/**
* 错误信息描述
*/
@NotNull
- private String Msg;
- /**
- * 参数实体
- */
- @NotNull
- private T Data;
+ @JsonProperty("Msg")
+ private String msg;
/**
* 签名
*/
@NotNull
- private String Sig;
+ @JsonProperty("Sig")
+ private String sig;
+
+ /**
+ * 运营商对象
+ */
+ private Operator operator;
}
--
Gitblit v1.7.1