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

src/dsb/com/cnd3b/restcontroller/customer/live/SQL/观看时长.sql

@@ -1 +1 @@
-select CEILING(sum(playduration)/60) as num from tlive_viewlog where channelid = $channelid$
+select CEILING(sum(playduration)) as num from tlive_viewlog where channelid = $channelid$

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

@@ -156,7 +156,7 @@ public class live extends Controller {
             //ÈË´Î
             liveuv = paoRemote.getInt("liveuv");
             //ʱ³¤
-            duration = paoRemote.getInt("duration") / 60;
+            duration = paoRemote.getInt("duration") ;
         }
 
         JSONObject resultObject = new JSONObject();
@@ -271,7 +271,7 @@ public class live extends Controller {
             //ÈË´Î
             liveuv = paoRemote.getInt("liveuv");
             //ʱ³¤
-            duration = paoRemote.getInt("duration") / 60;
+            duration = paoRemote.getInt("duration") ;
         }
 
         JSONObject resultObject = new JSONObject();

src/dsb/com/cnd3b/restcontroller/customer/supplyanddemand/SQL/供需详情查询.sql

@@ -3,6 +3,7 @@ select t1.tsupplyanddemandid, t1.ftitle,t1.fissupply,
        t1.fenddate,t1.tcooperationagentsid,t2.fagentname,t3.fname,t3.fphonenumber,
        t1.fcontent,t1.tenterprise_userid,
        t1.freadtimes,
+       t2.tagentsid,
        (select count(0) from timdialog where siteid=t1.siteid and ownertable='tsupplyanddemand' and ownerid=t1.tsupplyanddemandid) as fcommunicationtimes
 from tsupplyanddemand t1
 inner join tagents t2 on t1.siteid=t2.siteid and t1.tagentsid=t2.tagentsid

src/dsb/com/cnd3b/restcontroller/customer/supplyanddemand/SQL/我的供需详情查询.sql

@@ -4,6 +4,7 @@ select t1.tsupplyanddemandid, t1.ftitle,t1.fissupply,
        t1.fcontent,t4.fagentname as fcooperationagentname,
        t1.tenterprise_userid,
        t1.freadtimes,
+       t2.tagentsid,
        (select count(0) from timdialog where siteid=t1.siteid and ownertable='tsupplyanddemand' and ownerid=t1.tsupplyanddemandid) as fcommunicationtimes
 from tsupplyanddemand t1
 inner join tagents t2 on t1.siteid=t2.siteid and t1.tagentsid=t2.tagentsid