Merge remote-tracking branch 'origin/master'

whepi-ui/templates/home/home.ftl

@@ -2,7 +2,7 @@
 <#include "/home/frag.head.ftl" />
 
 <input class="weui-tab">
-    <input id="userId" type="text" hidden="hidden" value=${user_id}/>
+    <input id="userId" type="text" hidden="hidden" value=${user_id!}/>
     <div class="weui-tab__bd">
         <div id="tab1" class="weui-tab__bd-item weui-tab__bd-item--active">
             <#include "/home/ribao.ftl" /></div>

whepi-ui/templates/yeweihui/home.ftl

@@ -2,7 +2,7 @@
 <#include "/home/frag.head.ftl" />
 
 <div class="weui-tab">
-    <input id="userId" type="text" hidden="hidden" value=${user_id}/>
+    <input id="userId" type="text" hidden="hidden" value=${user_id!}/>
     <div class="weui-tab__bd">
         <div id="tab1" class="weui-tab__bd-item weui-tab__bd-item--active">
             <#include "/yeweihui/ribaoDy.ftl" /></div>