From 620bb4712a31791231c4381581f0f60088f079fe Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 27 五月 2026 14:03:45 +0800
Subject: [PATCH] Merge branch 'refs/heads/dev_New_pro' into dev_宁夏_英泽防锈

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

diff --git a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
index cb32b58..fa10c92 100644
--- a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
+++ b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
@@ -20,11 +20,6 @@
     @Excel(name = "渚涘簲鍟嗗悕绉�")
     private String supplierName;
 
-    @Schema(description = "渚涘簲鍟嗙被鍨�")
-    @TableField(value = "supplier_type")
-    @Excel(name = "渚涘簲鍟嗙被鍨�")
-    private String supplierType;
-
     @Schema(description = "绾崇◣浜鸿瘑鍒彿")
     @Excel(name = "绾崇◣浜鸿瘑鍒彿")
     private String taxpayerIdentificationNum;
@@ -85,6 +80,10 @@
     @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
 
+    @Schema(description = "渚涘簲鍟嗙被鍨�")
+    @TableField(value = "supplier_type")
+    private String supplierType;
+
     @TableField(fill = FieldFill.INSERT)
     private Long deptId;
 }

--
Gitblit v1.9.3