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-system/src/main/java/com/ruoyi/system/query/TBillQuery.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TBillQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TBillQuery.java
new file mode 100644
index 0000000..1d66290
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TBillQuery.java
@@ -0,0 +1,34 @@
+package com.ruoyi.system.query;
+
+import com.ruoyi.common.core.domain.BasePage;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class TBillQuery extends BasePage {
+ /**
+ * 缴费状态 1=未缴费 2=待确认 3=已缴费 4=已逾期
+ */
+ @ApiModelProperty("缴费状态 1=未缴费 2=待确认 3=已缴费 4=已逾期")
+ private Integer payFeesStatus;
+ @ApiModelProperty("联系电话")
+ private String phone;
+ @ApiModelProperty("租户名称")
+ private String residentName;
+ @ApiModelProperty("合同编号")
+ private String contractNumber;
+ /**
+ * 租户ID
+ */
+ @ApiModelProperty("租户ID")
+ private String userId;
+ /**
+ * 账单类型
+ */
+ @ApiModelProperty("账单类型 1=租金 2=押金 3=生活费用 4=房屋验收")
+ private Integer billType;
+
+
+
+
+}
--
Gitblit v1.7.1