Merge remote-tracking branch 'origin/master'

mitao

6 天以前 0b7e2752b6f1e87084b837043291c890cca780a8

 ruoyi-system/src/main/resources/mapper/system/OaApprovalApplicationsMapper.xml

@@ -33,6 +33,7 @@
        <if test="query.userId != null ">
            and applicant_user_id like concat('%',#{query.userId},'%')
        </if>
        order by approval_time desc
    </select>

</mapper>