From 296392b094a3531cd80bb7974914f494751b2e16 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期四, 14 十二月 2023 16:07:30 +0800 Subject: [PATCH] !458 fix 修复 excel合并注解会根据第一合并列的结果来决定后续的列合并 Merge pull request !458 from simple/excel --- ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/UserConstants.java | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/UserConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/UserConstants.java index c78adc2..6f3b0b9 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/UserConstants.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/UserConstants.java @@ -53,6 +53,16 @@ String DEPT_DISABLE = "1"; /** + * 宀椾綅姝e父鐘舵�� + */ + String POST_NORMAL = "0"; + + /** + * 宀椾綅鍋滅敤鐘舵�� + */ + String POST_DISABLE = "1"; + + /** * 瀛楀吀姝e父鐘舵�� */ String DICT_NORMAL = "0"; -- Gitblit v1.9.3