From 34181dcf0e38d744b8af1917bb5b8b0180b9eae1 Mon Sep 17 00:00:00 2001
From: jenkins <jenkins@example.com>
Date: 星期三, 20 五月 2026 18:45:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_pro_河南鹤壁
---
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