From 5bf2fd3f39c415703b153698ae5d95ed5c288aae Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期三, 17 十二月 2025 15:23:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cwxt_master' into cwxt_master
---
tms/src/main/java/com/ruoyi/tms/domain/TmsCustomerInfo.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/tms/src/main/java/com/ruoyi/tms/domain/TmsCustomerInfo.java b/tms/src/main/java/com/ruoyi/tms/domain/TmsCustomerInfo.java
index c500a51..33510be 100644
--- a/tms/src/main/java/com/ruoyi/tms/domain/TmsCustomerInfo.java
+++ b/tms/src/main/java/com/ruoyi/tms/domain/TmsCustomerInfo.java
@@ -9,7 +9,10 @@
import com.baomidou.mybatisplus.annotation.TableField;
import java.util.Date;
+import java.util.List;
+import com.ruoyi.cwgl.domain.BankAccountConfig;
+import com.ruoyi.cwgl.domain.InvoiceInfo;
import lombok.Data;
/**
@@ -95,13 +98,15 @@
@TableField("contact_email")
private String contactEmail;
-
+ @Excel(name = "绛剧害鍏徃")
+ @TableField("sign_company_id")
+ private Integer signCompanyId;
/**
* 绛剧害鍏徃
*/
@Excel(name = "绛剧害鍏徃")
- @TableField("sign_company")
- private String signCompany;
+ @TableField("sign_company_name")
+ private String signCompanyName;
/**
@@ -196,5 +201,17 @@
@TableField("remark")
private String remark;
+ /**
+ * 鍙戠エ淇℃伅鍒楄〃
+ */
+ @TableField(exist = false)
+ private List<InvoiceInfo> invoiceInfoList;
+
+ /**
+ * 閾惰璐﹀彿閰嶇疆鍒楄〃
+ */
+ @TableField(exist = false)
+ private List<BankAccountConfig> bankAccountConfigList;
+
}
--
Gitblit v1.8.0