From 1b6ccb5ac0edeb3c7f2ca9035c87b6ec24209c2f Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 22 四月 2026 14:35:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

---
 src/main/java/com/ruoyi/basic/pojo/SupplierManage.java |   12 +++++++++++-
 1 files changed, 11 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 a18a47b..8588c3e 100644
--- a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
+++ b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
@@ -14,11 +14,16 @@
 public class SupplierManage {
 
     @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(value = "渚涘簲鍟嗗悕绉�")
     @Excel(name = "渚涘簲鍟嗗悕绉�")
     private String supplierName;
+
+    @ApiModelProperty(value = "渚涘簲鍟嗙被鍨�")
+    @TableField(value = "supplier_type")
+    @Excel(name = "渚涘簲鍟嗗悕绉�")
+    private String supplierType;
 
     @ApiModelProperty(value = "绾崇◣浜鸿瘑鍒彿")
     @Excel(name = "绾崇◣浜鸿瘑鍒彿")
@@ -79,4 +84,9 @@
     @ApiModelProperty(value = "绉熸埛ID")
     @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
+
+
+
+    @TableField(fill = FieldFill.INSERT)
+    private Long deptId;
 }

--
Gitblit v1.9.3