From 2ac14cef837ceaa5201d6266485ab672f6f3d650 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 03 二月 2026 15:08:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sqd_new' into sqd_new
---
src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
index 3d5856f..067f81e 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
@@ -2,6 +2,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.stock.pojo.StockInventory;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -38,5 +39,8 @@
private BigDecimal totalStockOut;
private BigDecimal currentStock;
- private String unLockedQuantity;
+ private BigDecimal unLockedQuantity;
+
+ @ApiModelProperty("鐖禝D")
+ private Long parentId;
}
--
Gitblit v1.9.3