From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-common/src/main/java/com/ruoyi/common/constant/DictConstants.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 50 insertions(+), 0 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/DictConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/DictConstants.java
new file mode 100644
index 0000000..95169c0
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/DictConstants.java
@@ -0,0 +1,50 @@
+package com.ruoyi.common.constant;
+
+/**
+ * 缓存的key 常量
+ *
+ * @author ruoyi
+ */
+public class DictConstants
+{
+ /**
+ * 租户属性
+ */
+ public static final String DICT_TYPE_TENANT_ATTRIBUTE = "t_tenant_attribute";
+ /**
+ * 租户类型
+ */
+ public static final String DICT_TYPE_TENANT_TYPE = "t_tenant_type";
+ /**
+ * 租赁状态 1=待出租 2=已出租 3=维修中
+ */
+ public static final String DICT_TYPE_LEASE_STATUS = "t_lease_status";
+ /**
+ * 租金支付方式 1=月付 季付 年付
+ */
+ public static final String DICT_TYPE_CONTRACT_PAY_TYPE = "t_contract_pay_type";
+ /**
+ * 业务属性 1住宅2商业3工业4车位5办公6仓储
+ */
+ public static final String DICT_TYPE_BUSINESS_ATTRIBUTES = "t_business_attributes";
+ /**
+ * 合同状态 1=待提交 2=待审批 3=未签订 4=已签订 5=已驳回 6=已终止 7=待结算 8=已结算 9合同已签订待审
+ */
+ public static final String DICT_TYPE_CONTRACT_STATUS = "t_contract_status";
+ /**
+ * 验收状态 1=待验收 2=已验收
+ */
+ public static final String DICT_TYPE_CHECK_STATUS = "t_check_status";
+ /**
+ * 缴费状态 1=未缴费 2=待确认 3=已缴费 4=已逾期 5=已失效
+ */
+ public static final String DICT_TYPE_PAY_FEES_STATUS = "t_pay_fees_status";
+ /**
+ * 账单类型 1=租金 2=押金 3=生活费用 4=房屋验收
+ */
+ public static final String DICT_TYPE_BILL_TYPE = "t_bill_type";
+ /**
+ * 验收记录情况 1=良好 2=一般 3=较差
+ */
+ public static final String DICT_TYPE_CHECK_SITUATION = "t_check_situation";
+}
--
Gitblit v1.7.1