From 663e22ac294acf7a26ab2307b04ddd24700fd88b Mon Sep 17 00:00:00 2001 From: Simple <2424585654@qq.com> Date: 星期二, 12 十二月 2023 16:58:24 +0800 Subject: [PATCH] fix 修复 excel合并注解会根据第一合并列的结果来决定后续的列合并 --- ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java index 9e25b7b..6aadb3e 100644 --- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java +++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java @@ -21,14 +21,14 @@ */ private String headerFlag; - /** - * 鍏挜 + * 鍝嶅簲鍔犲瘑鍏挜 */ private String publicKey; /** - * 绉侀挜 + * 璇锋眰瑙e瘑绉侀挜 */ private String privateKey; + } -- Gitblit v1.9.3