Merge remote-tracking branch 'origin/main'

This commit is contained in:
ly19960718 2021-08-17 15:55:06 +08:00
commit 8818aae96f

View File

@ -75,7 +75,7 @@
LEFT JOIN LEFT JOIN
pollute_poll jt3 pollute_poll jt3
ON ON
t1.poll_id = jt3.poll_no (t1.poll_id = jt3.poll_no OR t1.poll_id = jt3.poll_no_old)
WHERE WHERE
1 = 1 1 = 1
<if test="keywords != null and keywords != ''"> <if test="keywords != null and keywords != ''">