From 50e3be607d7917b3e31fafcab2bdbfac281a3fd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Thu, 11 Jul 2024 16:30:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Doracle=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
index fd451cda5..935089f71 100644
--- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
+++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
@@ -135,7 +135,7 @@
             #{emp.deleteType,jdbcType=INTEGER},
             #{emp.tenantKey,jdbcType=VARCHAR},
             #{emp.employeeType,jdbcType=INTEGER},
-            #{emp.lockStatus,jdbcType=INTEGER}
+            #{emp.lockStatus,jdbcType=INTEGER},
             #{emp.subcompanyName,jdbcType=VARCHAR},
             #{emp.subcompanyId,jdbcType=DOUBLE},
             #{emp.departmentName,jdbcType=VARCHAR},

From b91818f2dc750eebf9c59fea1acd79ed7c4e602e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Mon, 15 Jul 2024 09:36:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/WEB-INF/prop/hrmSalary.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resource/WEB-INF/prop/hrmSalary.properties b/resource/WEB-INF/prop/hrmSalary.properties
index 86aac0d39..5c9223804 100644
--- a/resource/WEB-INF/prop/hrmSalary.properties
+++ b/resource/WEB-INF/prop/hrmSalary.properties
@@ -1,5 +1,5 @@
 log=false
 defaultCloseNonStandard149=true
 AESEncryptScrect=990EB004A1C862721C1513AE90038C9E
-version=2.14.5.2406.03
+version=2.15.1.2407.01
 openFormulaForcedEditing=false
\ No newline at end of file