From 1ca5584d7e3200a9af65a099bd26d3593e2ba702 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 07 五月 2026 14:36:08 +0800
Subject: [PATCH] 迁移pro

---
 src/main/java/com/ruoyi/basic/pojo/SupplierManage.java |   62 +++++++++++++++++++++----------
 1 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
index c54aebc..fa10c92 100644
--- a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
+++ b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
@@ -2,9 +2,11 @@
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 @Data
@@ -12,56 +14,76 @@
 public class SupplierManage {
 
     @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
 
-    @ApiModelProperty(value = "渚涘簲鍟嗗悕绉�")
+    @Schema(description = "渚涘簲鍟嗗悕绉�")
+    @Excel(name = "渚涘簲鍟嗗悕绉�")
     private String supplierName;
 
-    @ApiModelProperty(value = "绾崇◣浜鸿瘑鍒彿")
+    @Schema(description = "绾崇◣浜鸿瘑鍒彿")
+    @Excel(name = "绾崇◣浜鸿瘑鍒彿")
     private String taxpayerIdentificationNum;
 
-    @ApiModelProperty(value = "鍏徃鍦板潃")
+    @Schema(description = "鍏徃鍦板潃")
+    @Excel(name = "鍏徃鍦板潃")
     private String companyAddress;
 
-    @ApiModelProperty(value = "鍏徃鐢佃瘽")
+    @Schema(description = "鍏徃鐢佃瘽")
+    @Excel(name = "鍏徃鐢佃瘽")
     private String companyPhone;
 
-    @ApiModelProperty(value = "寮�鎴疯")
+    @Schema(description = "寮�鎴疯")
+    @Excel(name = "寮�鎴疯")
     private String bankAccountName;
 
-    @ApiModelProperty(value = "璐﹀彿")
+    @Schema(description = "璐﹀彿")
+    @Excel(name = "璐﹀彿")
     private String bankAccountNum;
 
-    @ApiModelProperty(value = "鑱旂郴浜�")
+    @Schema(description = "鑱旂郴浜�")
+    @Excel(name = "鑱旂郴浜�")
     private String contactUserName;
 
-    @ApiModelProperty(value = "鑱旂郴鐢佃瘽")
+    @Schema(description = "鑱旂郴鐢佃瘽")
+    @Excel(name = "鑱旂郴鐢佃瘽")
     private String contactUserPhone;
 
-    @ApiModelProperty(value = "缁存姢浜篒D")
+    @Schema(description = "缁存姢浜篒D")
+    @Excel(name = "缁存姢浜�")
     private Integer maintainUserId;
 
-    @ApiModelProperty(value = "缁存姢鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime maintainTime;
+    @Schema(description = "缁存姢鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+//    @Excel(name = "缁存姢鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+    private LocalDate maintainTime;
+    @Excel(name = "鏄惁鐧藉悕鍗�")
+    @Schema(description = "鏄惁鐧藉悕鍗曪紙0鏄� 1鍚︼級")
+    private Integer isWhite;
 
-    @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+    @Schema(description = "鍒涘缓鏃堕棿")
     @TableField(fill = FieldFill.INSERT)
     private LocalDateTime createTime;
 
-    @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+    @Schema(description = "鍒涘缓鐢ㄦ埛")
     @TableField(fill = FieldFill.INSERT)
     private Integer createUser;
 
-    @ApiModelProperty(value = "淇敼鏃堕棿")
+    @Schema(description = "淇敼鏃堕棿")
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private LocalDateTime updateTime;
 
-    @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+    @Schema(description = "淇敼鐢ㄦ埛")
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Integer updateUser;
 
-    @ApiModelProperty(value = "绉熸埛ID")
+    @Schema(description = "绉熸埛ID")
     @TableField(fill = FieldFill.INSERT)
-    private Integer tenantId;
+    private Long tenantId;
+
+    @Schema(description = "渚涘簲鍟嗙被鍨�")
+    @TableField(value = "supplier_type")
+    private String supplierType;
+
+    @TableField(fill = FieldFill.INSERT)
+    private Long deptId;
 }

--
Gitblit v1.9.3