From 3322c20909d2cc762b9a7a4a4c8b2bb728ebebd9 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 16 三月 2026 14:51:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_kthg' into dev_New_kthg
---
src/main/java/com/ruoyi/consumables/pojo/ConsumablesInRecord.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/consumables/pojo/ConsumablesInRecord.java b/src/main/java/com/ruoyi/consumables/pojo/ConsumablesInRecord.java
index 352c3f3..d970419 100644
--- a/src/main/java/com/ruoyi/consumables/pojo/ConsumablesInRecord.java
+++ b/src/main/java/com/ruoyi/consumables/pojo/ConsumablesInRecord.java
@@ -27,7 +27,7 @@
private String inboundBatches;
@ApiModelProperty(value = "鍏ュ簱鏁伴噺")
- private BigDecimal consumablesInNum;
+ private BigDecimal stockInNum;
@ApiModelProperty(value = "璁板綍绫诲瀷 鏋氫妇")
private String recordType;
--
Gitblit v1.9.3