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/BaseRequest.java |   26 ++------------------------
 1 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/BaseRequest.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/BaseRequest.java
index d2a11da..a2e4e9c 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/BaseRequest.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/BaseRequest.java
@@ -10,32 +10,10 @@
  * @Date 2025/1/21 17:08
  */
 @Data
-public class BaseRequest<T> {
-	/**
-	 * 运营商标识
-	 */
-	@NotNull
-	private String OperatorID;
-	/**
-	 * 参数内容
-	 */
-	@NotNull
-	private T Data;
-	/**
-	 * 时间戳
-	 * yyyyMMddHHmmss
-	 */
-	@NotNull
-	private Long TimeStamp;
-	/**
-	 * 自增序列
-	 * 4位自增序列取自时间戳,同一秒内按序列自增长,新秒重计。如 0001
-	 */
-	@NotNull
-	private String Seq;
+public class BaseRequest extends BaseModel {
 	/**
 	 * 数字签名
 	 */
 	@NotNull
-	private String Sig;
+	private String sig;
 }

--
Gitblit v1.7.1