From 6cc2a1d726e1019079b6d3fa74599426a359c001 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 02 Nov 2021 14:55:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_

---
 screen-api/src/main/java/com/moral/api/entity/SpecialDevice.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/entity/SpecialDevice.java b/screen-api/src/main/java/com/moral/api/entity/SpecialDevice.java
index 1e8fbde..34310b9 100644
--- a/screen-api/src/main/java/com/moral/api/entity/SpecialDevice.java
+++ b/screen-api/src/main/java/com/moral/api/entity/SpecialDevice.java
@@ -12,11 +12,11 @@
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author moral
- * @since 2021-08-18
+ * @since 2021-08-11
  */
 @Data
 @EqualsAndHashCode(callSuper = false)

--
Gitblit v1.8.0