From ae6879a7575f79d814c70781e6efc1b6218f3732 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 14 三月 2025 14:10:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
billion-main/src/main/java/com/billion/main/bs/domain/BsBomChildInfo.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/billion-main/src/main/java/com/billion/main/bs/domain/BsBomChildInfo.java b/billion-main/src/main/java/com/billion/main/bs/domain/BsBomChildInfo.java
index c6a4121..240f1df 100644
--- a/billion-main/src/main/java/com/billion/main/bs/domain/BsBomChildInfo.java
+++ b/billion-main/src/main/java/com/billion/main/bs/domain/BsBomChildInfo.java
@@ -1,10 +1,10 @@
package com.billion.main.bs.domain;
import com.billion.common.annotation.Excel;
+import com.billion.main.common.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
-import java.math.BigDecimal;
import java.util.Date;
/**
@@ -14,7 +14,7 @@
* @date 2024-11-25
*/
@Data
-public class BsBomChildInfo
+public class BsBomChildInfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -47,7 +47,7 @@
/** 鍗曡�� */
@Excel(name = "鍗曡��")
- private BigDecimal costQty;
+ private String costQty;
/** 鍗曚綅 */
@Excel(name = "鍗曚綅")
@@ -83,7 +83,4 @@
private Date updateTime;
-
- public void setCostQty(String count) {
- }
}
--
Gitblit v1.9.3