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

src/main/resources/mybatis/mapper/auth/SysWorkplaceDao.xml

@@ -18,6 +18,8 @@
             <if test="request.key != null and request.key != ''">
                 AND (sw.workplaceName like concat('%', #{request.key}, '%')
                 or sw.workplaceId like concat('%', #{request.key}, '%')
+                or auth_user.employeeName like concat('%', #{request.key}, '%')
+                or sw.remake like concat('%', #{request.key}, '%')
                 )
             </if>
             <if test=" request.invCode != null and request.invCode != ''">