Merge remote-tracking branch 'origin/dev' into dev

aijinhui

2024-04-15 dae6e068207ad1bff32dafd8c71f12d8a2a59aa2

 ard-work/src/main/java/com/ruoyi/sy/domain/ArdAccessFence.java

@@ -30,4 +30,6 @@
    private Integer drct;
    @TableField(value = "is_alarm")
    private Integer isAlarm;
    @TableField(exist = false)
    private Boolean isLock;
}