From 1bca1b9c61676b48cc3137d3003e520c75ecdd92 Mon Sep 17 00:00:00 2001 From: aijinhui <aijinhui> Date: 星期六, 13 一月 2024 10:57:36 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ard-work/src/main/java/com/ruoyi/device/camera/domain/ArdCameras.java | 6 +++++- 1 files changed, 5 insertions(+), 1 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 aaec59e..358aca0 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 @@ -74,7 +74,11 @@ @Excel(name = "鍏夌數绫诲瀷") private String gdtype; - + /** + * 鍘傚晢 + */ + @Excel(name = "鍘傚晢") + private String factory; /** * 缁忓害 -- Gitblit v1.9.3