From b1f91d23c01266dda8cad34aa866bcac741a21cf Mon Sep 17 00:00:00 2001 From: aijinhui <aijinhui> Date: 星期六, 23 十二月 2023 17:03:51 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ard-work/src/main/java/com/ruoyi/sy/domain/ArdAccessFence.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/ard-work/src/main/java/com/ruoyi/sy/domain/ArdAccessFence.java b/ard-work/src/main/java/com/ruoyi/sy/domain/ArdAccessFence.java index a87e44b..15928f9 100644 --- a/ard-work/src/main/java/com/ruoyi/sy/domain/ArdAccessFence.java +++ b/ard-work/src/main/java/com/ruoyi/sy/domain/ArdAccessFence.java @@ -1,5 +1,6 @@ package com.ruoyi.sy.domain; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; /** @@ -26,6 +27,7 @@ private String alarmLng; private String alarmLat; private String carModel; - private String drct; + private Integer drct; + @TableField(value = "is_alarm") private Integer isAlarm; } -- Gitblit v1.9.3