From 6c2c620999eaa5fcb353ebbbc6839c0d6a0122f7 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期三, 24 五月 2023 19:57:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/product/administration/config/SystemCode.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/product/administration/config/SystemCode.java b/src/main/java/com/product/administration/config/SystemCode.java
index 842fce2..d89bce9 100644
--- a/src/main/java/com/product/administration/config/SystemCode.java
+++ b/src/main/java/com/product/administration/config/SystemCode.java
@@ -268,6 +268,10 @@
     KNOWLEDGE_SHARING_GET_TAG_FAIL("鑾峰彇鐭ヨ瘑鍏变韩鏍囩澶辫触", ModuleEnum.ORGCOMMON.getValue() + "191"),
     KNOWLEDGE_SHARING_GET_IMAGE_FAIL("鑾峰彇鍥剧墖澶辫触", ModuleEnum.ORGCOMMON.getValue() + "192"),
 
+
+    CONFERENCE_ROOM_SAVE_FIAL_DUPLICATE_NAME("浼氳瀹や繚瀛樺け璐�,宸插瓨鍦ㄥ悓鍚嶇О浼氳瀹�", ModuleEnum.ADMINISTRAT.getValue() + "193"),
+    WORK_ATTENDANCE_REPORT_FAIL("鑰冨嫟鎶ヨ〃鑾峰彇澶辫触锛�", ModuleEnum.ADMINISTRAT.getValue() + "194"),
+    
     EXPORT_FILE_FAIL("瀵煎嚭鏂囦欢澶辫触", ModuleEnum.ADMINISTRAT.getValue() + "998"),
     IMPORT_FILE_FAIL("瀵煎叆鏂囦欢澶辫触", ModuleEnum.ADMINISTRAT.getValue() + "999"),
 

--
Gitblit v1.9.2