Merge remote-tracking branch 'origin/master'

# Conflicts:
#	whepi-ui/templates/yeweihui/home.ftl
#	whepi-ui/templates/yeweihui/qiuzhu.js
#	whepi-web/src/main/java/com/bofeng/dao/QzTaskDao.java
#	whepi-web/src/main/java/com/bofeng/dao/QzTaskReplyDao.java
#	whepi-web/src/main/java/com/bofeng/entity/QzTaskReply.java
#	whepi-web/src/main/java/com/bofeng/service/QzTaskReplyService.java
#	whepi-web/src/main/java/com/bofeng/service/QzTaskService.java
#	whepi-web/src/main/java/com/bofeng/wx/controller/YeWeiHuiController.java
#	whepi-web/src/main/resources/application.yml
#	whepi-web/src/main/resources/mapper/QzTaskDao.xml

whepi-ui/templates/yeweihui/home.ftl

@@ -39,8 +39,6 @@
 <script>
     <#include "/yeweihui/ribao.js" />
     <#include "/yeweihui/qiuzhu.js" />
-    var taskList = ${taskList!'[]'};
-var statisticsOrderList =${rbList!'[]'};
 (function ($) {
 
 
@@ -64,7 +62,7 @@ var statisticsOrderList =${rbList!'[]'};
     <#--console.log('ssssss');-->
     <#--var tasks = ${taskList!'[]'};-->
     // console.log('ssssss', tasks);
-    // console.log('asdsfdgfhjghfgdf');
+    console.log('asdsfdgfhjghfgdf');
 
     ribao_init();
     qiuzhu_init();

whepi-web/src/main/java/com/bofeng/entity/QzTaskReply.java

@@ -7,7 +7,7 @@ import java.util.Date;
 
 /**
  * qz_task_reply
- * @author 
+ * @author
  */
 @Data
 public class QzTaskReply implements Serializable {

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

@@ -1,22 +1,12 @@
 package com.bofeng.wx.controller;
 
 import com.bofeng.entity.QzTask;
-import com.bofeng.entity.QzTaskReply;
-import com.bofeng.entity.SysUptownHouse;
-import com.bofeng.service.QzTaskReplyService;
 import com.bofeng.service.QzTaskService;
-import com.bofeng.service.RbService;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.google.common.collect.Maps;
-import com.yvan.Model;
-import com.yvan.ModelOps;
-import com.yvan.mvc.Pd;
-import com.yvan.platform.JsonWapper;
 import com.yvan.platform.YvanUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;