From 0b57c36ace11b95ce296820a927615a8561d20ae Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期六, 14 九月 2024 19:00:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into dev

---
 src/main/java/com/product/file/config/CmnConst.java |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/product/file/config/CmnConst.java b/src/main/java/com/product/file/config/CmnConst.java
index 0a8b795..fc04f96 100644
--- a/src/main/java/com/product/file/config/CmnConst.java
+++ b/src/main/java/com/product/file/config/CmnConst.java
@@ -20,12 +20,15 @@
     public static final String PRODUCT_SYS_CLIENTS = "product_sys_clients"; // 瀹㈡埛琛�
     public static final String PRODUCT_SYS_ATTACHMENTS = "product_sys_attachments"; // 闄勪欢琛�
     public static final String PRODUCT_SYS_DICT = "product_sys_dict";
-    public static final String product_oa_DIRECTORY = "product_oa_directory";		//鏂囨。鐩綍琛�
-    public static final String product_oa_DIRECTORY_RIGHTS = "product_oa_directory_rights";		//鏂囨。鐩綍鏉冮檺琛�
-    public static final String product_oa_DOCUMENT = "product_oa_document";		//鏂囨。琛�
-    public static final String product_oa_DOCUMENT_LOG = "product_oa_document_log";		// 鏂囨。鎿嶄綔鏃ュ織琛�
+    public static final String PRODUCT_OA_DIRECTORY = "product_oa_directory";		//鏂囨。鐩綍琛�
+    public static final String PRODUCT_OA_DIRECTORY_RIGHTS = "product_oa_directory_rights";		//鏂囨。鐩綍鏉冮檺琛�
+    public static final String PRODUCT_OA_DOCUMENT = "product_oa_document";		//鏂囨。琛�
+    public static final String PRODUCT_OA_DOCUMENT_LOG = "product_oa_document_log";		// 鏂囨。鎿嶄綔鏃ュ織琛�
     public static final String PRODUCT_SYS_PRINT_TEMPLATE_RECORD = "product_sys_print_template_reocrd";// 鎵撳嵃妯℃澘璁板綍琛�
     public static final String PRODUCT_SYS_STAFFS = "product_sys_staffs";
+    public static final String TABLE_PRODUCT_SYS_ORG_LEVELS = "product_sys_org_levels";// 缁勭粐鏈烘瀯琛�
+    public static final String PRODUCT_OA_DOCUMENT_COLLECTION = "product_oa_document_collection";	// 鏂囨。鏀惰棌
+    public static final String PRODUCT_OA_DOCUMENT_HISTORY = "product_oa_document_history";
 
     public static final String ATTACHMENT_CAPACITY = "attachment_capacity";
     public static final String RESULT = "result";
@@ -50,6 +53,11 @@
     public static final String ATTACHMENT_URL = "attachment_url";
     public static final String ENCRPT_SIGN = "encrypt_sign";
     public static final String ATTACHMENT_TYPE_UUID = "attachment_type_uuid";
+    public static final String PRODUCT_SYS_FUNCTIONS = "product_sys_functions";
+    public static final String PRODUCT_SYS_DATAMODEL_FIELD = "product_sys_datamodel_field";
+    public static final String PRODUCT_SYS_DATAMODEL_TABLE = "product_sys_datamodel_table";
+        public static final String PRODUCT_AO_FILING_CONFIG = "product_oa_filing_config";
+
     public static final String OPT_FLAT = "opt_flat";
     public static final String UPLOAD_SIGN = "upload_sign";
 

--
Gitblit v1.9.2