Merge remote-tracking branch 'origin/master' into dev

许鹏程

2024-09-14 0b57c36ace11b95ce296820a927615a8561d20ae

 src/main/java/com/product/file/config/CmnConst.java

@@ -20,13 +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";
@@ -51,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";