From 493caef7413992d0215b9c2e2bcedd30471d89e7 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 26 三月 2024 15:49:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ruoyi/device/camera/domain/ArdCameras.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/domain/ArdCameras.java b/ard-work/src/main/java/com/ruoyi/device/camera/domain/ArdCameras.java
index cfdf554..a8cf456 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/domain/ArdCameras.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/domain/ArdCameras.java
@@ -1,5 +1,7 @@
package com.ruoyi.device.camera.domain;
+import com.lzhpo.sensitive.SensitiveStrategy;
+import com.lzhpo.sensitive.annocation.Sensitive;
import com.ruoyi.device.channel.domain.ArdChannel;
import com.sun.jna.Structure;
import lombok.AllArgsConstructor;
@@ -66,6 +68,7 @@
* 瀵嗙爜
*/
@Excel(name = "瀵嗙爜")
+ @Sensitive(strategy = SensitiveStrategy.PASSWORD)
private String password;
/**
@@ -74,7 +77,11 @@
@Excel(name = "鍏夌數绫诲瀷")
private String gdtype;
-
+ /**
+ * 鍘傚晢
+ */
+ @Excel(name = "鍘傚晢")
+ private String factory;
/**
* 缁忓害
@@ -104,7 +111,7 @@
* 閮ㄩ棬ID
*/
@Excel(name = "閮ㄩ棬ID")
- private Integer deptId;
+ private Long deptId;
/**
* 鏂逛綅瑙�
@@ -171,6 +178,10 @@
* 鐧诲綍ID
*/
private Integer loginId;
+ /**
+ * 鍦ㄧ嚎鐘舵�� 0-绂荤嚎 1-鍦ㄧ嚎
+ */
+ private String state;
private String operatorId;
private Date operatorExpired;
/**
--
Gitblit v1.9.3