diff --git a/resource/WEB-INF/prop/hrmSalary.properties b/resource/WEB-INF/prop/hrmSalary.properties index b539fda3a..565b5b1f7 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=3.0.2.2510.01s +version=3.0.3.2510.01s openFormulaForcedEditing=false \ No newline at end of file diff --git a/resource/wiki/二开/xbxtSalaryReport.properties b/resource/wiki/二开/xbxtSalaryReport.properties index d2be45d6a..586038a0e 100644 --- a/resource/wiki/二开/xbxtSalaryReport.properties +++ b/resource/wiki/二开/xbxtSalaryReport.properties @@ -1 +1,2 @@ -salaryItemIds=1695204436120,1695204436123,1695204436124,1695204436125,1695204436126,1695204436127,1695204436128,1695204436129,1695204436130,1695204436131,1695204436132,1695204436133,1695204436134,1695204436135,1695204436136, \ No newline at end of file +## salaryItemIds=1695204436120,1695204436123 +salaryItemIds= \ No newline at end of file diff --git a/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml b/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml index f67762cbf..8ac4caae7 100644 --- a/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml +++ b/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml @@ -746,7 +746,7 @@ #{salaryMonth} - ORDER BY id DESC + ORDER BY salary_month DESC