From 2a4d9802f9117d5d110e63ddaa41aada68731c4d Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 16 六月 2025 17:08:51 +0800
Subject: [PATCH] tenantId修改类型 + 客户导入+ 供应商导入+产品导入

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

diff --git a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
index 69abd9e..335dd3a 100644
--- a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
+++ b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
@@ -1,6 +1,7 @@
 package com.ruoyi.basic.pojo;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -19,19 +20,26 @@
     /**
      * 鍏宠仈浜у搧id
      */
+    @Excel(name = "鍏宠仈浜у搧id")
     private Long productId;
+
+    @TableField(exist = false)
+    @Excel(name = "浜у搧鍚嶇О")
+    private String productName;
 
     /**
      * 瑙勬牸鍨嬪彿
      */
+    @Excel(name = "瑙勬牸鍨嬪彿")
     private String model;
 
     /**
      * 鍗曚綅
      */
+    @Excel(name = "鍗曚綅")
     private String unit;
 
     @ApiModelProperty(value = "绉熸埛ID")
     @TableField(fill = FieldFill.INSERT)
-    private Integer tenantId;
+    private Long tenantId;
 }

--
Gitblit v1.9.3