From a022ae9804d0c2f402711b6b5202319d853919cf Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Fri, 09 Aug 2024 13:38:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-api/src/main/java/com/moral/api/pojo/enums/EmphasisEnum.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/pojo/enums/EmphasisEnum.java b/screen-api/src/main/java/com/moral/api/pojo/enums/EmphasisEnum.java
index 867a72e..3e9289d 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/enums/EmphasisEnum.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/enums/EmphasisEnum.java
@@ -14,13 +14,12 @@
@Getter
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum EmphasisEnum implements IntegerValueEnum {
- /**
- *������������
- */
+
+
+ NONE(0,"���"),
+
JZDLS(1, "���������������������������������������"),
- /**
- *������������
- */
+
JXHGK(2, "���������������"),
;
--
Gitblit v1.8.0