Merge remote-tracking branch 'origin/master'

guyue

2 天以前 b7ff8446a58d59e7df8a588104c231c7af7d8573

 src/main/resources/mapper/keywordMapper.xml

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

        ORDER BY
        r.repetition_num,
        r.create_time DESC