From bc0193e94c96c7ea60be17d250e00408dc787a87 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 18 十一月 2025 17:44:07 +0800
Subject: [PATCH] yys 1.销售、采购关于发票的改成不必填 2.回款类型字典改-下 3.销售台账、采购台账可能不开票直接回款 4.销售台账要直接查产品名字 5.指标维护-内控值为非必填 6.所有税率都自己填,有时候可能不含税

---
 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