From 931734244f977a65dd35c6f606afb999d7c3c967 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 14 Nov 2023 11:37:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa

---
 screen-api/src/main/java/com/moral/api/pojo/enums/SysDictTypeEnum.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/pojo/enums/SysDictTypeEnum.java b/screen-api/src/main/java/com/moral/api/pojo/enums/SysDictTypeEnum.java
index 4b91bf2..6137328 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/enums/SysDictTypeEnum.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/enums/SysDictTypeEnum.java
@@ -38,6 +38,11 @@
      *WIND
      */
     WIND_FARM_SCOPE("WIND","������������"),
+
+    SYS_DEVICE("DEVICE","������������������"),
+
+    SYS_AMEND("AMEND","������������������������"),
+
     ;
 
     @EnumValue

--
Gitblit v1.8.0