From 09361264d6d87b8ce57b61a26c5507dbc0a01031 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 28 八月 2026 23:16:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_建诚恒商贸' into dev_天津_玮苓乐器
---
src/main/java/com/ruoyi/staff/dto/CalculateSalaryDto.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/dto/CalculateSalaryDto.java b/src/main/java/com/ruoyi/staff/dto/CalculateSalaryDto.java
index 214d6aa..2ddb35b 100644
--- a/src/main/java/com/ruoyi/staff/dto/CalculateSalaryDto.java
+++ b/src/main/java/com/ruoyi/staff/dto/CalculateSalaryDto.java
@@ -1,5 +1,6 @@
package com.ruoyi.staff.dto;
+import java.math.BigDecimal;
import lombok.Data;
import java.util.List;
@@ -15,4 +16,6 @@
private String date;
+ private BigDecimal deductAmount;
+
}
--
Gitblit v1.9.3