From 33b9d2c203a9998272088ecdf43a15dd53669967 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Thu, 28 Mar 2024 15:51:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-api/src/main/java/com/moral/api/pojo/bo/ExcelBO.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/pojo/bo/ExcelBO.java b/screen-api/src/main/java/com/moral/api/pojo/bo/ExcelBO.java
index 5f11771..719c4f2 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/bo/ExcelBO.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/bo/ExcelBO.java
@@ -16,5 +16,9 @@
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
private Date date;
+ private String mac;
+
+ private String type;
+
}
--
Gitblit v1.8.0