From b09534d85ab2344151f570fd51889aca4da396b3 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 05 六月 2025 09:10:12 +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/OperatorInfo.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/OperatorInfo.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/OperatorInfo.java
index 3def9e6..309c546 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/OperatorInfo.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/OperatorInfo.java
@@ -1,5 +1,6 @@
package com.ruoyi.integration.drainage.model;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
@@ -16,30 +17,36 @@
* 运营商ID
*/
@NotNull
- private String OperatorID;
+ @JsonProperty("OperatorID")
+ private String operatorID;
/**
* 运营商名称
*/
@NotNull
- private String OperatorName;
+ @JsonProperty("OperatorName")
+ private String operatorName;
/**
* 运营商电话1
*/
@NotNull
- private String OperatorTel1;
+ @JsonProperty("OperatorTel1")
+ private String operatorTel1;
/**
* 运营商电话2
*/
@Null
- private String OperatorTel2;
+ @JsonProperty("OperatorTel2")
+ private String operatorTel2;
/**
* 运营商注册地址
*/
@Null
- private String OperatorRegAddress;
+ @JsonProperty("OperatorRegAddress")
+ private String operatorRegAddress;
/**
* 备注
*/
@Null
- private String OperatorNote;
+ @JsonProperty("OperatorNote")
+ private String operatorNote;
}
--
Gitblit v1.7.1