Merge remote-tracking branch 'origin/master'

mitao

2 天以前 2b82b1e1d31671b8581d2e463ad762bdf63dad30

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

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

</mapper>