From 2a9624d404acd466c76abdb21507748ef7b63fa5 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期六, 23 十二月 2023 23:08:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into 5.X

---
 ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/EncryptField.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/EncryptField.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/EncryptField.java
index ba0b958..d357d72 100644
--- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/EncryptField.java
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/EncryptField.java
@@ -32,7 +32,7 @@
     String publicKey() default "";
 
     /**
-     * 鍏挜銆俁SA銆丼M2闇�瑕�
+     * 绉侀挜銆俁SA銆丼M2闇�瑕�
      */
     String privateKey() default "";
 

--
Gitblit v1.9.3