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 | 8 ++++++--
1 files changed, 6 insertions(+), 2 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
index 19a3caf..95169c0 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/DictConstants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/DictConstants.java
@@ -28,7 +28,7 @@
*/
public static final String DICT_TYPE_BUSINESS_ATTRIBUTES = "t_business_attributes";
/**
- * 合同状态 1=待提交 2=待审批 3=未签订 4=已签订 5=已驳回 6=已终止 7=待结算 8=已结算
+ * 合同状态 1=待提交 2=待审批 3=未签订 4=已签订 5=已驳回 6=已终止 7=待结算 8=已结算 9合同已签订待审
*/
public static final String DICT_TYPE_CONTRACT_STATUS = "t_contract_status";
/**
@@ -40,7 +40,11 @@
*/
public static final String DICT_TYPE_PAY_FEES_STATUS = "t_pay_fees_status";
/**
- * 账单类型 1=租金 2=押金 3=生活费用
+ * 账单类型 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