From df13b146673c8fc43a7495a6d017383b80346948 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期四, 16 四月 2026 14:59:27 +0800
Subject: [PATCH] feat(supplier): 增加供应商类型字段支持

---
 src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java |    3 +++
 src/main/resources/mapper/basic/SupplierManageMapper.xml        |    3 ++-
 src/main/java/com/ruoyi/basic/pojo/SupplierManage.java          |    9 ++++++---
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java b/src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java
index 29e1af0..b3edb9d 100644
--- a/src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java
+++ b/src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java
@@ -15,6 +15,9 @@
     @Excel(name = "渚涘簲鍟嗗悕绉�")
     private String supplierName;
 
+    @Excel(name = "渚涘簲鍟嗙被鍨�")
+    private String supplierType;
+
     @Excel(name = "绾崇◣浜鸿瘑鍒彿")
     private String taxpayerIdentificationNum;
 
diff --git a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
index 7153751..8588c3e 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;
 
+    @ApiModelProperty(value = "渚涘簲鍟嗙被鍨�")
+    @TableField(value = "supplier_type")
+    @Excel(name = "渚涘簲鍟嗗悕绉�")
+    private String supplierType;
+
     @ApiModelProperty(value = "绾崇◣浜鸿瘑鍒彿")
     @Excel(name = "绾崇◣浜鸿瘑鍒彿")
     private String taxpayerIdentificationNum;
@@ -80,9 +85,7 @@
     @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
 
-    @ApiModelProperty(value = "渚涘簲鍟嗙被鍨�")
-    @TableField(value = "supplier_type")
-    private String supplierType;
+
 
     @TableField(fill = FieldFill.INSERT)
     private Long deptId;
diff --git a/src/main/resources/mapper/basic/SupplierManageMapper.xml b/src/main/resources/mapper/basic/SupplierManageMapper.xml
index 87688e1..757c6d6 100644
--- a/src/main/resources/mapper/basic/SupplierManageMapper.xml
+++ b/src/main/resources/mapper/basic/SupplierManageMapper.xml
@@ -56,7 +56,8 @@
         T1.update_user,
         T1.tenant_id,
         T1.is_white,
-        T2.nick_name AS maintainUserName
+        T2.nick_name AS maintainUserName,
+        T1.supplier_type
         FROM supplier_manage T1
         LEFT JOIN sys_user T2 ON T1.maintain_user_id = T2.user_id
         <where>

--
Gitblit v1.9.3