From 644c6b5f5808c49f59d27f2ed9400cc70c4dd22a Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期五, 09 五月 2025 09:52:08 +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 | 4 +++-
1 files changed, 3 insertions(+), 1 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 c8846f0..1419343 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
@@ -3,6 +3,7 @@
import com.aps.common.core.annotation.Excel;
import com.aps.common.core.web.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -17,6 +18,7 @@
*/
@EqualsAndHashCode(callSuper = true)
@Data
+
public class ApsBom extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -54,7 +56,7 @@
/** 鎬绘暟閲� */
@Excel(name = "鎬绘暟閲�")
- private BigDecimal totalNum;
+ private BigDecimal total_num;
/** 鍑嗗宸ユ椂 */
@Excel(name = "鍑嗗宸ユ椂")
--
Gitblit v1.9.3