qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release/2.15.1.2407.01' into release/个税版本

This commit is contained in:
钱涛 2024-07-15 10:25:50 +08:00
parent 7db62ab647 b91818f2dc
commit a72c5e83e2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resource/WEB-INF/prop/hrmSalary.properties
View File

@ -1,5 +1,5 @@
log=false log=false
defaultCloseNonStandard149=true defaultCloseNonStandard149=true
AESEncryptScrect=990EB004A1C862721C1513AE90038C9E AESEncryptScrect=990EB004A1C862721C1513AE90038C9E
version=2.14.5.2406.03 version=2.15.1.2407.01
openFormulaForcedEditing=false openFormulaForcedEditing=false

2
src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
View File

@ -135,7 +135,7 @@
#{emp.deleteType,jdbcType=INTEGER}, #{emp.deleteType,jdbcType=INTEGER},
#{emp.tenantKey,jdbcType=VARCHAR}, #{emp.tenantKey,jdbcType=VARCHAR},
#{emp.employeeType,jdbcType=INTEGER}, #{emp.employeeType,jdbcType=INTEGER},
#{emp.lockStatus,jdbcType=INTEGER} #{emp.lockStatus,jdbcType=INTEGER},
#{emp.subcompanyName,jdbcType=VARCHAR}, #{emp.subcompanyName,jdbcType=VARCHAR},
#{emp.subcompanyId,jdbcType=DOUBLE}, #{emp.subcompanyId,jdbcType=DOUBLE},
#{emp.departmentName,jdbcType=VARCHAR}, #{emp.departmentName,jdbcType=VARCHAR},