From 0d7d874912d0147376826b55667a1deb6547ed91 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:25:27 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈

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

diff --git a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
index fa10c92..cb32b58 100644
--- a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
+++ b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
@@ -20,6 +20,11 @@
     @Excel(name = "渚涘簲鍟嗗悕绉�")
     private String supplierName;
 
+    @Schema(description = "渚涘簲鍟嗙被鍨�")
+    @TableField(value = "supplier_type")
+    @Excel(name = "渚涘簲鍟嗙被鍨�")
+    private String supplierType;
+
     @Schema(description = "绾崇◣浜鸿瘑鍒彿")
     @Excel(name = "绾崇◣浜鸿瘑鍒彿")
     private String taxpayerIdentificationNum;
@@ -79,10 +84,6 @@
     @Schema(description = "绉熸埛ID")
     @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