Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop

4 years ago · c693eaf8b6
1 changed files with 1 additions and 0 deletions
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@ -313,6 +313,7 @@
        <if test="name != null and name != ''">
            AND ir.`NAME` concat('%',#{name},'%')
        </if>
        and ir.status='0'
    ORDER BY
        CONVERT ( ir.NAME USING gbk ) ASC
    </select>