Merge branch 'pre' into 'master'

修改 sql

See merge request !293

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/resources/com.liquidnet.service.sweet.mapper/SweetManualFiveMapper.xml

@@ -75,7 +75,7 @@
         ) AS t ON p.performances_id = t.performance_id
         <where>
             <if test="title!='' and title != null">
-                AND (title LIKE concat('%', #{title}, '%') OR title like '%M_DSK%')
+                AND (title LIKE concat('%', #{title}, '%'))
             </if>
         </where>
         ORDER BY p.created_at desc