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 | 4 ++++ 1 files changed, 4 insertions(+), 0 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 287b231..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 @@ -80,5 +80,9 @@ @TableField("contract_number") private String contractNumber; + @ApiModelProperty(value = "开票文件名称") + @TableField("invoice_voucher_name") + private String invoiceVoucherName; + } -- Gitblit v1.7.1