Merge branch 'dev' into docker_package

This commit is contained in:
wangliwen 2022-07-06 17:58:36 +08:00
commit ceb5c5fdea
1 changed files with 3 additions and 5 deletions

View File

@ -1326,11 +1326,9 @@
WHERE 1=1 WHERE 1=1
AND del_flag = 0 AND del_flag = 0
AND id in AND id in
<if>
<foreach item="resourceId" collection="list" open="(" separator="," close=")"> <foreach item="resourceId" collection="list" open="(" separator="," close=")">
#{resourceId} #{resourceId}
</foreach> </foreach>
</if>
GROUP BY type GROUP BY type
ORDER BY type ORDER BY type
</select> </select>