From dbb571785c8720d1fe171c7f774afa30cc3e84b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Tue, 21 Oct 2025 18:07:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/entity/salaryacct/bo/SalaryAcctRecordBO.java | 4 ---- .../salary/entity/salaryacct/dto/SalaryAcctRecordListDTO.java | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java index ba977a693..ce06f3244 100644 --- a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java +++ b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java @@ -50,10 +50,6 @@ public class SalaryAcctRecordBO { List salarySendCheckResult, Map workflowStatusMap, List taxAgentPOS) { - List taxAgentPOS, - List needApprovalSalarySobIds, - boolean approvalCanFile, - boolean approvalCanReCalc) { if (CollectionUtils.isEmpty(salaryAcctRecordPOS)) { return Collections.emptyList(); } diff --git a/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctRecordListDTO.java b/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctRecordListDTO.java index 4c007e5ce..6eadf9136 100644 --- a/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctRecordListDTO.java +++ b/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctRecordListDTO.java @@ -78,7 +78,7 @@ public class SalaryAcctRecordListDTO { private String workflowUrl; // @TableTitle(title = "审批状态", dataIndex = "approvalStatus", key = "approvalStatus") -// private String approvalStatus; + private String approvalStatus; @TableTitle(title = "操作", dataIndex = "operate", key = "operate") private List operate;