Merge remote-tracking branch 'origin/master'

huliguo

3 天以前 11ec7ac8f4832c4274cf61a19cc35cda3de9e0e5

 src/main/resources/mapper/keywordMapper.xml

@@ -44,7 +44,6 @@
        </if>
        AND r.num = #{num}

        AND p.del_flag = 0
        GROUP BY
        p.platform_id,
        p.platform_name
@@ -93,8 +92,6 @@
            <if test="typeId != null">
                AND p.type_id = #{typeId}
            </if>
            AND p.del_flag = 0
            AND t.del_flag = 0
        GROUP BY
        t.type_id, t.type_name, p.platform_id, p.platform_name
        ORDER BY
@@ -121,7 +118,6 @@
            <if test="platformId != null">
                AND r.platform_id = #{platformId}
            </if>
            AND p.del_flag = 0
        ORDER BY
        r.create_time DESC
    </select>