Merge branch 'pre' into 'master'

Pre

See merge request !24

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinPerformancesMapper.xml

@@ -466,6 +466,7 @@
                                                                                       group by kotr.performance_id,kot.user_id
                                                                                   ) t
             ) AS ut ON ut.performance_id = kp.performances_id
+            order by kt.type desc,kt.use_start asc
     </select>
     <select id="getPerformanceSponsorList" resultMap="performanceSponsorDaoResult">
         select distinct kp.sponsor_id, kp.sponsor, kp.sponsor_type