Merge remote-tracking branch 'origin/master'

# Conflicts:
#	whepi-web/src/main/java/com/bofeng/wx/controller/UserOpenController.java

whepi-ui/templates/home/home.ftl

@@ -1,8 +1,8 @@
 <#assign title="我的家"/>
 <#include "/home/frag.head.ftl" />
 
-<input class="weui-tab">
-    <input id="userId" type="text" hidden="hidden" value=${user_id}/>
+<div class="weui-tab">
+    <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>

whepi-web/src/main/java/com/bofeng/wx/controller/HomeController.java

@@ -60,9 +60,15 @@ public class HomeController {
     return Model.newSuccess(qzTaskService.queryQzTask(taskStatus));
   }
 
-  //小区求助的查看
-  @GetMapping("/home/home/taskQuery")
-  public Model<List<QzTaskReply>> taskQuery(@Pd(name = "taskId")Long taskId){
-    return Model.newSuccess(qzTaskReplyService.taskQuery(taskId));
-  }
+    //小区求助的查看
+    @GetMapping("/home/home/taskQuery")
+    public Model<List<QzTaskReply>> taskQuery(@Pd(name = "taskId") Long taskId) {
+        return Model.newSuccess(qzTaskReplyService.taskQuery(taskId));
+    }
+
+    @GetMapping("/home/home_new.html")
+    public ModelAndView hmoe_new(ModelMap model) {
+        model.put("user", new JsonWapper("{\"www\": \"er\"}"));
+        return new ModelAndView("/home/home_new.ftl", model);
+    }
 }