Merge remote-tracking branch 'origin/dev' into dev

src/main/resources/mapper/textbook/TextbookMapper.xml

@@ -48,6 +48,7 @@
         <if test="dto.publishingHouse != null and dto.publishingHouse != ''">
             and t1.publishing_house like concat('%', #{dto.publishingHouse}, '%')
         </if>
+        order by t3.name desc
     </select>
 
     <select id="subscriptionList" resultType="com.xjrsoft.module.textbook.vo.TextbookSubscriptionRecordVo">