Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -225,7 +225,7 @@
             <if test="workers != null and workers.size > 0">
                 AND (
                 a.worker_id IN
-                <foreach item="item" index="index" collection="ex.adminWebsitIds" open="(" separator="," close=")">
+                <foreach item="item" index="index" collection="workers" open="(" separator="," close=")">
                     #{item}
                 </foreach>
                 )