From f6fa17a3a817f8cc1743cb881aa9927227ed2867 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 31 五月 2022 13:36:55 +0800
Subject: [PATCH] add 新增 easyexcel 单元格合并注解与处理器
---
ruoyi-common/src/main/java/com/ruoyi/common/enums/DeviceType.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DeviceType.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/DeviceType.java
index e6ac849..118a212 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DeviceType.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/DeviceType.java
@@ -21,7 +21,12 @@
/**
* app绔�
*/
- APP("app");
+ APP("app"),
+
+ /**
+ * 灏忕▼搴忕
+ */
+ XCX("xcx");
private final String device;
}
--
Gitblit v1.9.3