From 8cb8a874db01acd1113cfeb5c2c5bf7e9555ff65 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期六, 21 十月 2023 15:26:42 +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