From f57064d2fa563ee4cfeeccd715850ba8b8aa4f60 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 18 五月 2026 09:44:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/purchase/pojo/ProductRecord.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/pojo/ProductRecord.java b/src/main/java/com/ruoyi/purchase/pojo/ProductRecord.java
index c1d33ac..5003107 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/ProductRecord.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/ProductRecord.java
@@ -1,9 +1,11 @@
package com.ruoyi.purchase.pojo;
+import io.swagger.v3.oas.annotations.media.Schema;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
+import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@@ -15,7 +17,7 @@
*/
@Data
@TableName("product_record")
-public class ProductRecord {
+public class ProductRecord implements Serializable {
private static final long serialVersionUID = 1L;
/**
@@ -33,6 +35,11 @@
* 閲囪喘鍙拌处id
*/
private Long purchaseLedgerId;
+
+ /**
+ * 浜у搧id
+ */
+ private Long saleLedgerProjectId;
/**
* 浜у搧澶х被
@@ -97,12 +104,12 @@
/**
* 鏈潵绁ㄦ暟
*/
- private BigDecimal futureTickets;
+ private BigDecimal futureTickets = BigDecimal.ZERO;
/**
* 鏈潵绁ㄩ噾棰�(鍏�)
*/
- private BigDecimal futureTicketsAmount;
+ private BigDecimal futureTicketsAmount = BigDecimal.ZERO;
/**
* 浜у搧id
@@ -121,5 +128,12 @@
private Date createdAt;
@TableField(fill = FieldFill.INSERT)
- private Integer tenantId;
+ private Long tenantId;
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
}
--
Gitblit v1.9.3