From 9ce27f53094be15ee2e69c0dce31e3f324bfda99 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 05 二月 2025 15:06:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1

---
 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/BaseModel.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/BaseModel.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/BaseModel.java
index e8b5882..97b9934 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/BaseModel.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/BaseModel.java
@@ -15,24 +15,24 @@
 	 * 运营商标识
 	 */
 	@NotNull
-	private String OperatorID;
+	private String operatorID;
 	/**
 	 * 参数内容
 	 */
 	@NotNull
-	private String Data;
+	private String data;
 	/**
 	 * 时间戳
 	 * yyyyMMddHHmmss
 	 */
 	@NotNull
-	private Long TimeStamp;
+	private Long timeStamp;
 	/**
 	 * 自增序列
 	 * 4位自增序列取自时间戳，同一秒内按序列自增长，新秒重计。如 0001
 	 */
 	@NotNull
-	private String Seq;
+	private String seq;
 	/**
 	 * 运营商对象
 	 */

--
Gitblit v1.7.1