Merge remote-tracking branch 'remotes/origin/release/2.9.2.2307.02' into feature/230702-非系统人员导入功能
This commit is contained in:
commit
a8f9134418
|
|
@ -743,7 +743,7 @@
|
|||
|
||||
|
||||
<!-- 更新不为NULL的字段 -->
|
||||
<update id="updateIgnoreNull" parameterType="com.engine.salary.entity.salaryitem.po.SalaryItemPO">
|
||||
<update id="updateIgnoreNull" parameterType="com.engine.salary.entity.salaryBill.po.SalarySendInfoPO">
|
||||
UPDATE hrsa_salary_send_info
|
||||
<set>
|
||||
<if test="salarySendId != null">
|
||||
|
|
@ -752,9 +752,6 @@
|
|||
<if test="salaryMonth != null">
|
||||
salary_month=#{salaryMonth},
|
||||
</if>
|
||||
<if test="useType != null">
|
||||
use_type=#{useType},
|
||||
</if>
|
||||
<if test="salaryAcctRecordId != null">
|
||||
salary_acct_record_id=#{salaryAcctRecordId},
|
||||
</if>
|
||||
|
|
|
|||
Loading…
Reference in New Issue