Skip to content
Snippets Groups Projects

111111

Merged 崔用芳 requested to merge feature/cyf into dev
Compare and
1 file
+ 1
1
Compare changes
  • Side-by-side
  • Inline
@@ -289,7 +289,7 @@
t_income a
left JOIN t_income_type b ON b.id = a.income_type_id
<if test="qry.incomeTypeId != null and qry.incomeTypeId!=''">
<if test="qry.incomeTypeId == null or qry.incomeTypeId ==''">
or FIND_IN_SET(b.income_type_name, a.pre_income_type)
</if>
left join t_entry_bill d on d.income_id=a.id