From 50cf972c100b28e368590b07c33e5f78c20475d0 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期五, 23 五月 2025 16:17:55 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java
index 475b8cc..624d390 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java
@@ -58,7 +58,7 @@
/** 鎬绘暟閲� */
@Excel(name = "鎬绘暟閲�")
- private BigDecimal total_num;
+ private BigDecimal totalNum;
/** 鍑嗗宸ユ椂 */
@Excel(name = "鍑嗗宸ユ椂")
@@ -89,11 +89,7 @@
/** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
private String delFlag;
- private String mainitemcode;
- private BigDecimal mainstock;
- private String subitemcode;
- private BigDecimal usagenum;
- private BigDecimal substock;
- private String selfmade;
+ private String mainItemCode;
+ private String selfMade;
}
--
Gitblit v1.9.3