Merge branch 'zhuyajie' into 'master'

广告主倒序

See merge request rays/pcloud-book!68

pcloud-service-book/src/main/resources/mapper/advertising/AdvertisingMasterMapper.xml

@@ -68,7 +68,7 @@
             and m.master_name like concat('%', #{masterName}, '%')
         </if>
         group by
-            m.id
+            m.id desc
     </select>
 
     <select id="getAllMaster" resultMap="AdvertisingMasterDTO">