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/TBillAppletQuery.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TBillAppletQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TBillAppletQuery.java
new file mode 100644
index 0000000..c4a5b44
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TBillAppletQuery.java
@@ -0,0 +1,32 @@
+package com.ruoyi.system.query;
+
+import com.ruoyi.common.core.domain.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel("租户详情-缴费账单列表查询")
+public class TBillAppletQuery extends BasePage {
+ /**
+ * 缴费状态 1=未缴费 2=待确认 3=已缴费 4=已逾期
+ */
+ @ApiModelProperty("缴费状态 全部不传 1=未缴费 2=待确认 3=已缴费 4=已逾期")
+ private Integer payFeesStatus;
+ /**
+ * 租户ID
+ */
+ @ApiModelProperty("租户ID")
+ private String id;
+ /**
+ * 合同ids
+ */
+ @ApiModelProperty("合同ids 前端忽略")
+ private List<String> contractIds;
+
+
+
+
+}
--
Gitblit v1.7.1