Merge remote-tracking branch 'origin/master'

baizonghao

2023-03-04 43b6ab16ed0480a09dce7b7c5a3ecdfbef3e41a5

 ycl-common/src/main/resources/mapper/depart/UmsDepartMapper.xml

@@ -50,7 +50,7 @@
        FROM ums_depart ud
        WHERE is_deleted = 0
        <if test="departName!=null and departName!=''">
            and ud.name like CONCAT('%',#{departName},'%')
            and ud.depart_name like CONCAT('%',#{departName},'%')
        </if>
        ORDER BY ud.parent_id,ud.id desc
        LIMIT #{offset}, #{size}