Merge branch 'pre' into 'master'

提交chime社交相关

See merge request !56

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/report/performanceData.html

@@ -615,7 +615,8 @@
             },
             tooltip : {
                 trigger: 'item',
-                formatter: "{a} <br/>{b} : {c} ({d}%)"
+                // formatter: "{a} <br/>{b} : {c} ({d}%)"
+                formatter: "{b} ({d}%)"
             },
             legend: {
                 orient : 'vertical',
@@ -634,7 +635,8 @@
                         normal:{
                             label:{
                                 show:true,
-                                formatter: "{b} :\n  {c} \n ({d}%)",
+                                // formatter: "{b} :\n  {c} \n ({d}%)",
+                                formatter: "{b} :\n {d}%",
                                 position:"inner"
                             }
                         }

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

@@ -59,7 +59,7 @@
                               and kots.transfer_status in('0','1','3','5')
                               and kot.coupon_type ='no'
                             group by kotr.performance_id,ca.pre_city
-                        ) x order by x.total_number desc
+                        ) x order by x.total_number desc limit 20
     </select>
     <!-- 演出按年龄统计-->
     <select id="getAgeDataList" parameterType="java.lang.String" resultMap="getAgeDataListResult">