Merge remote-tracking branch 'origin/master'

This commit is contained in:
zhangqinlin
2021-09-27 10:51:52 +08:00
@@ -121,6 +121,7 @@
left join pay_income_contract_associated pica on pica.project_id = pms.id
<where>
pms.company_id = #{param.companyId}
and pms.check_result = 1
<if test="param.meetingName != null and param.meetingName != ''">
and ps.meeting_name like concat('%', #{param.meetingName}, '%')
</if>