From 49120f2b9db33455756a911e56cfefd7c3120a14 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期三, 28 十月 2026 17:05:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatBonus.java | 38 ++++++++++++++++++++++++++------------
1 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatBonus.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatBonus.java
index 90e8a9f..c917138 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatBonus.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatBonus.java
@@ -19,13 +19,6 @@
private static final long serialVersionUID = 1L;
/**
- * 缁熻鏈堜唤
- */
- @ApiModelProperty("缁熻鏈堜唤")
- @Excel(name = "缁熻鏈堜唤", sort = 1)
- private String bonusmonth;
-
- /**
* 閮ㄩ棬id
*/
@ApiModelProperty("閮ㄩ棬id")
@@ -35,7 +28,7 @@
* 閮ㄩ棬鍚嶇О
*/
@ApiModelProperty("閮ㄩ棬鍚嶇О")
- @Excel(name = "涓氬姟缁�", sort = 2)
+ @Excel(name = "涓氬姟缁�", sort = 1)
private String deptName;
/**
@@ -48,14 +41,35 @@
* 鏀剁泭浜哄鍚�
*/
@ApiModelProperty("鏀剁泭浜哄鍚�")
- @Excel(name = "涓撹亴浜哄憳", sort = 3)
+ @Excel(name = "缁╂晥浜哄憳", sort = 2)
private String beneficiaryname;
/**
- * 閲戦
+ * 缁╂晥閲戦
*/
- @ApiModelProperty("閲戦")
- @Excel(name = "閲戦", sort = 4, scale = 2)
+ @ApiModelProperty("缁╂晥閲戦")
+ @Excel(name = "缁╂晥閲戦", sort = 3, scale = 2)
private BigDecimal amount;
+ /**
+ * 鏈堝害缁╂晥閲戦
+ */
+ @ApiModelProperty("鏈堝害缁╂晥閲戦")
+ @Excel(name = "鏈堝害缁╂晥", sort = 4, scale = 2)
+ private BigDecimal mamount;
+
+ /**
+ * 瀛ｅ害缁╂晥閲戦
+ */
+ @ApiModelProperty("瀛ｅ害缁╂晥閲戦")
+ @Excel(name = "瀛ｅ害缁╂晥", sort = 5, scale = 2)
+ private BigDecimal samount;
+
+ /**
+ * 骞村害缁╂晥閲戦
+ */
+ @ApiModelProperty("骞村害缁╂晥閲戦")
+ @Excel(name = "骞村害缁╂晥", sort = 6, scale = 2)
+ private BigDecimal yamount;
+
}
--
Gitblit v1.9.3