From 3240968279b2960b05071db0ac4e950955a69dfd Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 21 十月 2025 13:06:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index 7b478d1..efa03ec 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -4,11 +4,13 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
/**
* 浜у搧淇℃伅瀵硅薄 sales_ledger_product
@@ -56,7 +58,8 @@
*/
@Excel(name = "鏁伴噺")
private BigDecimal quantity;
-
+ @Excel(name = "鏈�浣庡簱瀛樻暟閲�")
+ private BigDecimal minStock;
/**
* 绋庣巼
*/
@@ -161,4 +164,12 @@
@ApiModelProperty(value = "涓存椂鏈潵绁ㄩ噾棰�")
@TableField(exist = false)
private BigDecimal tempFutureTicketsAmount;
+
+ @ApiModelProperty("鐧昏浜�")
+ private String register;
+
+ @ApiModelProperty("鐧昏鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鐧昏鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime registerDate;
}
--
Gitblit v1.9.3