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

src/dsb/com/cnd3b/restcontroller/enterprise/activity/SQL/访客入场信息查询.sql

@@ -1,2 +1,2 @@
 select t1.tactivitysignupid,t1.createdate,t1.flocation,t1.fecid from tactivityvisitmsg t1
-where t1.siteid=$siteid$ and t1.tactivitysignupid in $t1.tactivitysignupid$
+where t1.siteid=$siteid$ and t1.tactivitysignupid in $tactivitysignupid$

src/dsb/com/cnd3b/restcontroller/enterprise/activity/SQL/访客登记信息查询.sql

@@ -1,2 +1,2 @@
-select t1.createdate,t1.faddress,t1.fchannel,t1.fcompname,t1.fidcard,t1.findustry,t1.fname,t1.fphonenumber,t1.frole,t1.tactivitysignupid from tactivitysignup t1
+select t1.createdate,t1.faddress,t1.fchannel,t1.fcompname,t1.fidcard,t1.findustry,t1.fname,t1.fphonenumber,t1.frole,t1.tactivitysignupid,t1.fquestionnaire from tactivitysignup t1
 where $where$ and t1.siteid=$siteid$ and t1.tactivityid=$tactivityid$

src/dsb/com/cnd3b/restcontroller/publicmethod/live/SQL/当前线上观众人数查询.sql

@@ -8,6 +8,7 @@ select channelid,
        count as fcustcount,
        t.channelcoverimageurl,
        t4.saleprodclass,
+       t4.faddress,
        fliveshowurl
 from (
          select ROW_NUMBER() over(partition by t1.channelid order by t1.time desc)as num,t1.channelid,