From 77775b9f3d7179f251ce85421fb9a21d106f1446 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期二, 06 一月 2026 17:56:35 +0800
Subject: [PATCH] 协同办公-发货审批页面,开发接口。优化添加发货信息接口,勾连发货审批。优化销售产品查询接口,多表联查数据。添加发货车牌号、发货日期、审批状态、返回数据。

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

diff --git a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
index c8da541..335dd3a 100644
--- a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
+++ b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
@@ -1,8 +1,8 @@
 package com.ruoyi.basic.pojo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
@@ -20,15 +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 Long tenantId;
 }

--
Gitblit v1.9.3