From 950f31ee2351e2d26ede3eeba49c09d52f46b296 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 03 十一月 2023 17:31:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-admin/src/main/resources/i18n/messages_en_US.properties |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties b/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties
index 3b74bd8..b7ceca4 100644
--- a/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties
+++ b/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties
@@ -35,3 +35,7 @@
 no.delete.permission=You do not have permission to delete data. Please contact the administrator to add permissions [{0}]
 no.export.permission=You do not have permission to export data. Please contact the administrator to add permissions [{0}]
 no.view.permission=You do not have permission to view data. Please contact the administrator to add permissions [{0}]
+
+##\u7EDF\u4E00\u8FD4\u56DE
+operation.failed=Operation failed
+operation.success=Operation successful
\ No newline at end of file

--
Gitblit v1.9.3