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

kaiyu

2021-03-25 247f19f6c3f17c2ac2f37b55c7d0550731f31ffe

 screen-api/src/main/resources/mapper/UserMapper.xml

@@ -47,13 +47,4 @@
      WHERE u.account = #{account}
    </select>

    <select id="selectUsers" resultType="java.util.Map">
        SELECT id,account,user_name userName,email,mobile,wechat FROM `user` WHERE
        <if test="orgId!=null">
            organization_id = #{orgId}
        </if>
        <if test="userId!=null">
            id = #{userId}
        </if>
    </select>
</mapper>