From 9df95cfc0f6109d0cc04657d26a2c9af033950d9 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 11 一月 2024 13:37:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/sy/domain/ArdSyCarLock.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/domain/ArdSyCarLock.java b/ard-work/src/main/java/com/ruoyi/sy/domain/ArdSyCarLock.java
index e4ec985..833ccfd 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/domain/ArdSyCarLock.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/domain/ArdSyCarLock.java
@@ -1,17 +1,16 @@
package com.ruoyi.sy.domain;
-import com.ruoyi.common.core.domain.BaseEntity;
import lombok.Data;
@Data
-public class ArdSyCarLock extends BaseEntity {
+public class ArdSyCarLock {
private String id;
private String rtuId;
private String lockName;
private String imgPositionTop;
private String imgPositionLeft;
private String relay;
- private String relayInfo;
- private String current;
- private String currentInfo;
+ private Integer relayInfo;
+ private String currents;
+ private Double currentInfo;
}
--
Gitblit v1.9.3