id, merchant_name, merchant_phone, type_id, merchant_logo, address, merchant_detail, create_time, update_time, create_by, update_by, disabled SELECT tm.id, tm.merchant_name, tm.merchant_phone, tm.type_id, tm.merchant_logo, tm.address, tm.merchant_detail, tm.create_time, tm.update_time, tm.create_by, tm.update_by, tm.disabled, tmt.type_name FROM t_merchant tm left join t_merchant_type tmt on tm.type_id = tmt.id AND tm.merchant_name LIKE CONCAT('%',#{query.merchantName},'%') AND tm.merchant_phone LIKE CONCAT('%',#{query.merchantPhone},'%') AND tm.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()} ORDER BY tm.create_time DESC