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/model/TInvoice.java | 57 +++++++++++++++++++++++----------------------------------
1 files changed, 23 insertions(+), 34 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TInvoice.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TInvoice.java
index 42b9cec..cf29a4f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TInvoice.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TInvoice.java
@@ -1,11 +1,16 @@
package com.ruoyi.system.model;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.math.BigDecimal;
import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,41 +22,41 @@
* </p>
*
* @author xiaochen
- * @since 2025-01-17
+ * @since 2025-01-20
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_invoice")
@ApiModel(value="TInvoice对象", description="开票管理")
-public class TInvoice implements Serializable {
+public class TInvoice extends BaseModel {
private static final long serialVersionUID = 1L;
- @TableId("id")
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
private String id;
@ApiModelProperty(value = "申请编号")
- @TableField("invoiceNumber")
+ @TableField("invoice_number")
private String invoiceNumber;
@ApiModelProperty(value = "金额")
- @TableField("invoiceMoney")
- private Double invoiceMoney;
+ @TableField("invoice_money")
+ private BigDecimal invoiceMoney;
@ApiModelProperty(value = "申请人")
- @TableField("applyName")
+ @TableField("apply_name")
private String applyName;
@ApiModelProperty(value = "抬头类型 1=企业 2=个人")
- @TableField("titleType")
+ @TableField("title_type")
private Integer titleType;
@ApiModelProperty(value = "抬头名称")
- @TableField("titleName")
+ @TableField("title_name")
private String titleName;
@ApiModelProperty(value = "税号/身份证号")
- @TableField("serialNumber")
+ @TableField("serial_number")
private String serialNumber;
@ApiModelProperty(value = "开票状态 1=待开票 2=已开票")
@@ -59,11 +64,12 @@
private Integer status;
@ApiModelProperty(value = "开票日期")
- @TableField("invoiceTime")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("invoice_time")
private LocalDateTime invoiceTime;
@ApiModelProperty(value = "开票凭证")
- @TableField("invoiceVoucher")
+ @TableField("invoice_voucher")
private String invoiceVoucher;
@ApiModelProperty(value = "邮箱")
@@ -71,29 +77,12 @@
private String email;
@ApiModelProperty(value = "开票合同编号逗号分割")
- @TableField("contractNumber")
+ @TableField("contract_number")
private String contractNumber;
- @ApiModelProperty(value = "创建时间")
- @TableField("createTime")
- private LocalDateTime createTime;
-
- @ApiModelProperty(value = "修改时间")
- @TableField("updateTime")
- private LocalDateTime updateTime;
-
- @ApiModelProperty(value = "创建人")
- @TableField("createBy")
- private String createBy;
-
- @ApiModelProperty(value = "修改人")
- @TableField("updateBy")
- private String updateBy;
-
- @ApiModelProperty(value = "是否删除 0=否 1=是")
- @TableField("isDelete")
- @TableLogic
- private Integer isDelete;
+ @ApiModelProperty(value = "开票文件名称")
+ @TableField("invoice_voucher_name")
+ private String invoiceVoucherName;
}
--
Gitblit v1.7.1