From 37d2350961bc16543d28e2c9c158dfb2c3734d73 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期三, 05 二月 2025 15:05:32 +0800 Subject: [PATCH] 合并代码 --- ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/BaseModel.java | 12 ++++-------- 1 files changed, 4 insertions(+), 8 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..6f56442 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 @@ -14,25 +14,21 @@ /** * 运营商标识 */ - @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