From 41d35c56043108b66a14e7a2d2d13bedfc2508e0 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 06 二月 2026 13:34:42 +0800
Subject: [PATCH] Merge branch 'dev_New' into pcdz

---
 src/main/java/com/ruoyi/basic/pojo/SupplierManage.java |    9 ++++++++-
 1 files changed, 8 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 142a6f2..60242f1 100644
--- a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
+++ b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
@@ -14,7 +14,11 @@
 public class SupplierManage {
 
     @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
+
+    @ApiModelProperty(value = "渚涘簲鍟嗙被鍨�")
+    @Excel(name = "渚涘簲鍟嗙被鍨�")
+    private String supplierType;
 
     @ApiModelProperty(value = "渚涘簲鍟嗗悕绉�")
     @Excel(name = "渚涘簲鍟嗗悕绉�")
@@ -56,6 +60,9 @@
     @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