Merge branch 'master' of ssh://111.61.77.35:15/gengdidi/gassafety-progress into master

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/video/TVideoManagerController.java

@@ -73,13 +73,21 @@ public class TVideoManagerController extends BaseController
         //I级树
         EnterpriseVideoTreeNode enterpriseVideoFirst = new EnterpriseVideoTreeNode();
         List<EnterpriseVideoTreeNode> enterpriseVideoFirstChildrnList = new ArrayList<>();
-        enterpriseVideoFirst.setVideoName("企业监控");
+        enterpriseVideoFirst.setVideoName("视频监控");
         enterpriseVideoFirst.setLevel("1");
 
 
         List<TEnterpriseInfo> tEnterpriseInfos = itEmployedPeopleInfoService.selectTEnterpriseInfoList(new TEnterpriseInfo());
-        for(TEnterpriseInfo tEnterpriseInfo : tEnterpriseInfos){
+        TEnterpriseInfo cg=new TEnterpriseInfo();
+        cg.setEnterpriseId(new Long(0));
+        cg.setEnterpriseName("城管视频");
+        tEnterpriseInfos.add(cg);
+        TEnterpriseInfo gd=new TEnterpriseInfo();
+        gd.setEnterpriseId(new Long(999));
+        gd.setEnterpriseName("高点");
+        tEnterpriseInfos.add(gd);
 
+        for(TEnterpriseInfo tEnterpriseInfo : tEnterpriseInfos){
 
             //II级树
             EnterpriseVideoTreeNode enterpriseVideoSecond= new EnterpriseVideoTreeNode();