From 88ae1e650fc2fc30928edfe8f3cc39108d8d1ccd Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 06 五月 2026 15:44:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/basic/pojo/ProductModel.java | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
index 3997459..f0e9470 100644
--- a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
+++ b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
@@ -2,12 +2,16 @@
import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
@Data
@TableName("product_model")
-public class ProductModel {
+public class ProductModel implements Serializable {
private static final long serialVersionUID = 1L;
@@ -27,14 +31,15 @@
@Excel(name = "浜у搧鍚嶇О")
private String productName;
- @Excel(name = "浜у搧缂栫爜")
- private String productCode;
-
/**
* 瑙勬牸鍨嬪彿
*/
@Excel(name = "瑙勬牸鍨嬪彿")
private String model;
+
+ @Excel(name = "浜у搧缂栫爜")
+ @TableField("product_code")
+ private String productCode;
/**
* 鍗曚綅
@@ -48,7 +53,30 @@
@Excel(name = "鐢熶骇鐐掓満")
private String speculativeTradingName;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
+ @TableField(exist = false)
+ @Excel(name = "鍏ュ簱鏁伴噺")
+ private BigDecimal inboundNum;
+ @TableField(exist = false)
+ @Excel(name = "鍑哄簱鏁伴噺")
+ private BigDecimal outboundNum;
+ @TableField(exist = false)
+ @Excel(name = "鍓╀綑搴撳瓨")
+ private BigDecimal stockQuantity;
+
+ @TableField(exist = false)
+ private LocalDateTime createTime;
+
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
+ @Schema(description = "椤堕儴鐖朵骇鍝乮d")
+ @TableField(exist = false)
+ private Long topProductParentId;
}
--
Gitblit v1.9.3