Merge remote-tracking branch 'origin/master'

无关风月

10 天以前 720e3c0e119ca062dc69aca47ec6c42254fee75d

Merge remote-tracking branch 'origin/master'

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

@@ -26,7 +26,7 @@
            and t1.location_name like concat('%',#{query.locationName},'%')
        </if>
        and t1.`disabled` = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}

        group by t1.id
    </select>

</mapper>