From d6e67b6e4a033ee8b29549b10a994f6ac53d3f1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Fri, 21 Nov 2025 11:10:16 +0800 Subject: [PATCH] =?UTF-8?q?=E9=92=B1=E6=99=BA=EF=BC=8C=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/sqlupgrade/Mysql/sql202511210103SHQZJRXXFW.sql | 1 + resource/sqlupgrade/SQLServer/sql202511210103SHQZJRXXFW.sql | 2 ++ .../salary/entity/salaryacct/dto/SalaryAcctRecordListDTO.java | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 resource/sqlupgrade/Mysql/sql202511210103SHQZJRXXFW.sql create mode 100644 resource/sqlupgrade/SQLServer/sql202511210103SHQZJRXXFW.sql diff --git a/resource/sqlupgrade/Mysql/sql202511210103SHQZJRXXFW.sql b/resource/sqlupgrade/Mysql/sql202511210103SHQZJRXXFW.sql new file mode 100644 index 000000000..26a17cd3a --- /dev/null +++ b/resource/sqlupgrade/Mysql/sql202511210103SHQZJRXXFW.sql @@ -0,0 +1 @@ +ALTER TABLE hrsa_salary_acct_record ADD COLUMN msg text; \ No newline at end of file diff --git a/resource/sqlupgrade/SQLServer/sql202511210103SHQZJRXXFW.sql b/resource/sqlupgrade/SQLServer/sql202511210103SHQZJRXXFW.sql new file mode 100644 index 000000000..da411610d --- /dev/null +++ b/resource/sqlupgrade/SQLServer/sql202511210103SHQZJRXXFW.sql @@ -0,0 +1,2 @@ +ALTER TABLE hrsa_salary_acct_record ADD msg text +GO \ No newline at end of file diff --git a/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctRecordListDTO.java b/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctRecordListDTO.java index 33bc15ee2..f383583be 100644 --- a/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctRecordListDTO.java +++ b/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctRecordListDTO.java @@ -67,7 +67,7 @@ public class SalaryAcctRecordListDTO { @TableTitle(title = "审批状态", dataIndex = "approvalStatus", key = "approvalStatus") private String approvalStatus; - @TableTitle(title = "执行状态", dataIndex = "runStatus", key = "runStatus") + @TableTitle(title = "批量操作状态", dataIndex = "runStatus", key = "runStatus") private String runStatus; @TableTitle(title = "操作", dataIndex = "operate", key = "operate")