From ab0b4b2397c46701e372a49cf8ff4d268bb577b3 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期三, 23 四月 2025 10:40:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsResourceGroupTemp.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsResourceGroupTemp.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsResourceGroupTemp.java
index e4ef04b..c772fb8 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsResourceGroupTemp.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsResourceGroupTemp.java
@@ -6,6 +6,7 @@
import com.aps.common.core.annotation.Excel;
import com.aps.common.core.web.domain.BaseEntity;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@@ -32,7 +33,7 @@
/** 姣忔棩鐞嗚鏃堕棿 */
@Excel(name = "姣忔棩鐞嗚鏃堕棿")
- private Long theoryHours;
+ private BigDecimal theoryHours;
/** 鎴闇�姹傛棩鍓╀綑澶╂暟 */
@Excel(name = "鎴闇�姹傛棩鍓╀綑澶╂暟")
@@ -40,7 +41,7 @@
/** 鐞嗚浜ц兘 */
@Excel(name = "鐞嗚浜ц兘")
- private Long theoryCapacity;
+ private BigDecimal theoryCapacity;
/** 鏈哄姞闇�姹傛棩鏈� */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -87,12 +88,12 @@
return devicesQuantity;
}
- public void setTheoryHours(Long theoryHours)
+ public void setTheoryHours(BigDecimal theoryHours)
{
this.theoryHours = theoryHours;
}
- public Long getTheoryHours()
+ public BigDecimal getTheoryHours()
{
return theoryHours;
}
@@ -107,12 +108,12 @@
return restDays;
}
- public void setTheoryCapacity(Long theoryCapacity)
+ public void setTheoryCapacity(BigDecimal theoryCapacity)
{
this.theoryCapacity = theoryCapacity;
}
- public Long getTheoryCapacity()
+ public BigDecimal getTheoryCapacity()
{
return theoryCapacity;
}
--
Gitblit v1.9.3