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

src/dsb/com/cnd3b/restcontroller/customer/live/live.java

@@ -246,7 +246,6 @@ public class live extends Controller {
         //观看人数（人）
         double viewers = getCount("观看人数", "num", channelid);
         resultObject.put("viewers", String.format("%.2f", viewers));
-        System.err.println(viewCounts + "," + viewDuration + "," + viewers);
         //人均观看次数（次）
         resultObject.put("viewCountsAvg", String.format("%.2f", viewers == 0.0 ? 0 : viewCounts / viewers));
         //人均观看时长（分钟）