From a41e23347029bf69a3f59438749658252de81d2e Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 15 十月 2024 09:41:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TInvoiceInformation.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TInvoiceInformation.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TInvoiceInformation.java
index c3d62b5..103142b 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TInvoiceInformation.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TInvoiceInformation.java
@@ -38,7 +38,11 @@
@ApiModelProperty(value = "发票类型（1=增值税普通发票，2=增值税专用发票）")
@TableField("invoice_type")
- private Integer invoiceType;
+ private String invoiceType;
+
+ @ApiModelProperty(value = "发票类型（1=增值税普通发票，2=增值税专用发票）")
+ @TableField("invoice_type_id")
+ private Integer invoiceTypeId;
@ApiModelProperty(value = "抬头类型（1=个人，2=企业）")
@TableField("invoicing_object_type")
@@ -68,9 +72,9 @@
@TableField("bank_account")
private String bankAccount;
-// @ApiModelProperty(value = "设置默认（0=否，1=是）")
-// @TableField("default")
-// private Integer default;
+ @ApiModelProperty(value = "设置默认（0=否，1=是）")
+ @TableField("is_default")
+ private Integer isDefault;
--
Gitblit v1.7.1