Merge remote-tracking branch 'origin/master'

src/main/resources/mapper/NoticeMapper.xml

@@ -65,6 +65,7 @@
                 type = #{type}
             </if>
         </where>
+        ORDER BY id DESC
     </select>
 
     <delete id="deleteByPrimaryKey" parameterType="integer">

src/main/resources/mapper/VoteActivityMapper.xml

@@ -32,6 +32,7 @@
         <if test="startTime != null and endTime != null">
             AND start_time &gt;= #{startTime} AND start_time &lt;= #{endTime}
         </if>
+        ORDER BY id DESC
     </select>
 
     <delete id="deleteByPrimaryKey" parameterType="integer">