From 59fcc48c8589b9df2af744fd6c77854061a52f54 Mon Sep 17 00:00:00 2001 From: aijinhui <aijinhui> Date: 星期一, 16 十月 2023 10:07:16 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ard-work/src/main/java/com/ruoyi/statistical/domain/PumpStatus.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/statistical/domain/PumpStatus.java b/ard-work/src/main/java/com/ruoyi/statistical/domain/PumpStatus.java index 30bbacd..6c5e76f 100644 --- a/ard-work/src/main/java/com/ruoyi/statistical/domain/PumpStatus.java +++ b/ard-work/src/main/java/com/ruoyi/statistical/domain/PumpStatus.java @@ -1,5 +1,6 @@ package com.ruoyi.statistical.domain; +import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; /** @@ -7,7 +8,7 @@ */ @Data public class PumpStatus { - private String id; + private Integer targetId; private String name; private String alarmType; private String alarmTime; -- Gitblit v1.9.3