From 005e11377f508e3a79b528572a386a2af43697ca Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期五, 09 一月 2026 16:24:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy

---
 src/main/java/com/ruoyi/basic/pojo/SupplierManage.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
index 3855879..a18a47b 100644
--- a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
+++ b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,36 +17,48 @@
     private Integer id;
 
     @ApiModelProperty(value = "渚涘簲鍟嗗悕绉�")
-
+    @Excel(name = "渚涘簲鍟嗗悕绉�")
     private String supplierName;
 
     @ApiModelProperty(value = "绾崇◣浜鸿瘑鍒彿")
+    @Excel(name = "绾崇◣浜鸿瘑鍒彿")
     private String taxpayerIdentificationNum;
 
     @ApiModelProperty(value = "鍏徃鍦板潃")
+    @Excel(name = "鍏徃鍦板潃")
     private String companyAddress;
 
     @ApiModelProperty(value = "鍏徃鐢佃瘽")
+    @Excel(name = "鍏徃鐢佃瘽")
     private String companyPhone;
 
     @ApiModelProperty(value = "寮�鎴疯")
+    @Excel(name = "寮�鎴疯")
     private String bankAccountName;
 
     @ApiModelProperty(value = "璐﹀彿")
+    @Excel(name = "璐﹀彿")
     private String bankAccountNum;
 
     @ApiModelProperty(value = "鑱旂郴浜�")
+    @Excel(name = "鑱旂郴浜�")
     private String contactUserName;
 
     @ApiModelProperty(value = "鑱旂郴鐢佃瘽")
+    @Excel(name = "鑱旂郴鐢佃瘽")
     private String contactUserPhone;
 
     @ApiModelProperty(value = "缁存姢浜篒D")
+    @Excel(name = "缁存姢浜�")
     private Integer maintainUserId;
 
     @ApiModelProperty(value = "缁存姢鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd")
+//    @Excel(name = "缁存姢鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
     private LocalDate maintainTime;
+    @Excel(name = "鏄惁鐧藉悕鍗�")
+    @ApiModelProperty(value = "鏄惁鐧藉悕鍗曪紙0鏄� 1鍚︼級")
+    private Integer isWhite;
 
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     @TableField(fill = FieldFill.INSERT)

--
Gitblit v1.9.3