From 1ec94c00e5c312818c9e1e3742ca838e60b7e5e7 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 20 十月 2025 17:15:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/TErpGoodsInventoryVO.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TErpGoodsInventoryVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TErpGoodsInventoryVO.java
index 88ca654..d1fe42e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TErpGoodsInventoryVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TErpGoodsInventoryVO.java
@@ -51,9 +51,13 @@
private String packingUnitId;
- @ApiModelProperty(value = "商品单价")
+
+ @ApiModelProperty(value = "商品售价")
private BigDecimal salesAmount;
+ @ApiModelProperty(value = "商品单价")
+ private BigDecimal unitAmount;
+
@ApiModelProperty(value = "失效日期")
private LocalDateTime expiryDate;
--
Gitblit v1.7.1