Merge branch 'fix/salaryTemplateUpdateBug_0407' into release/2.7.3.2304.01
This commit is contained in:
commit
5847f3f449
|
|
@ -368,10 +368,10 @@
|
|||
salary_item_null_status=#{salaryItemNullStatus},
|
||||
</if>
|
||||
<if test="salaryItemZeroStatus != null">
|
||||
salary_item_zero_status=#{salaryItemNullStatus},
|
||||
salary_item_zero_status=#{salaryItemZeroStatus},
|
||||
</if>
|
||||
<if test="salaryItemSetting != null">
|
||||
salary_item_setting=#{salaryItemZeroStatus},
|
||||
salary_item_setting=#{salaryItemSetting},
|
||||
</if>
|
||||
<if test="replenishName != null">
|
||||
replenish_name=#{replenishName},
|
||||
|
|
|
|||
Loading…
Reference in New Issue