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/TInvoiceQuery.java | 61 ++++++++++++++++++++++++++++++
1 files changed, 61 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TInvoiceQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TInvoiceQuery.java
new file mode 100644
index 0000000..7a7cf34
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TInvoiceQuery.java
@@ -0,0 +1,61 @@
+package com.ruoyi.system.query;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+
+@Data
+@ApiModel(value="开票查询列表Query")
+public class TInvoiceQuery extends BasePage {
+ @ApiModelProperty(value = "id")
+ private String id;
+ @ApiModelProperty(value = "申请编号")
+ private String invoiceNumber;
+
+ @ApiModelProperty(value = "金额")
+ private Double invoiceMoney;
+
+ @ApiModelProperty(value = "申请人")
+ private String applyName;
+
+ @ApiModelProperty(value = "抬头类型 1=企业 2=个人")
+ private Integer titleType;
+
+ @ApiModelProperty(value = "抬头名称")
+ private String titleName;
+
+ @ApiModelProperty(value = "税号/身份证号")
+ private String serialNumber;
+
+ @ApiModelProperty(value = "开票状态 1=待开票 2=已开票")
+ private Integer status;
+
+ @ApiModelProperty(value = "开票日期")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime invoiceTime;
+
+ @ApiModelProperty(value = "开票凭证")
+ private String invoiceVoucher;
+
+ @ApiModelProperty(value = "邮箱")
+ private String email;
+
+ @ApiModelProperty(value = "开票合同编号逗号分割")
+ private String contractNumber;
+
+ @ApiModelProperty(value = "开票开始日期")
+ private String invoiceStartTime;
+
+ @ApiModelProperty(value = "开票结束日期")
+ private String invoiceEndTime;
+
+ @ApiModelProperty(value = "开票文件名称")
+ private String invoiceVoucherName;
+
+}
--
Gitblit v1.7.1