Merge branch 'master' of http://gitlab.scsmile.cn/zxf/sample-form-platform

sample-form-manager/src/main/java/com/mortals/xhx/module/home/pdu/HomeQueryPdu.java

@@ -7,4 +7,7 @@ public class HomeQueryPdu {
     private Long siteId;
 
     private String devicenum;
+
+
+    private Integer newSource;
 }

sample-form-manager/src/main/java/com/mortals/xhx/module/home/web/HomeController.java

@@ -147,6 +147,9 @@ public class HomeController extends BaseJsonBodyController {
         return ret;
     }
 
+
+
+
     @PostMapping({"info"})
     @UnAuth
     public Rest<Object> homePageInfo(@RequestBody HomeQueryPdu homeQueryPdu) {
@@ -181,7 +184,7 @@ public class HomeController extends BaseJsonBodyController {
             model.put("totalThrift", 996);    //累计节约
             model.put("message_info", busiDesc + "成功");
             Rest<com.mortals.xhx.common.pdu.site.SitePdu> info = siteFeign.info(homeQueryPdu.getSiteId());
-            model.put("title", info.getData().getSiteName()); //标题
+            model.put("title", info==null?"":info.getData().getSiteName()); //标题
             HotwordEntity hotwordEntity = hotwordService.selectOne(new HotwordQuery().siteId(homeQueryPdu.getSiteId()));
             model.put("blankCount", hotwordEntity==null?20:hotwordEntity.getPrintDisplay()); //空白样表数量