Merge remote-tracking branch 'origin/master'

# Conflicts:
#	mybusiness/src/main/resources/templates/business/manager/cameramanager/onePreview.html

mybusiness/src/main/resources/templates/business/manager/cameramanager/onePreview.html

@@ -17,15 +17,15 @@
                 <div class="ibox-content">
                     <!--视频窗口展示-->
                     <iframe id="mIframe" src="http://218.27.1.154:9090/hik_video/en/demo.html" style="width:100%;height:900px;"></iframe>
-<!--                    <iframe id="mIframe" src="http://192.168.3.101:88/en/demo.html" style="width:100%;height:900px;"></iframe>-->
-                </div>
-            </div>
+                    <!-- <iframe id="mIframe" src="http://192.168.3.101:88/en/demo.html" style="width:100%;height:900px;"></iframe>-->
+                 </div>
+             </div>
 
-        </div>
-    </div>
-</div>
+         </div>
+     </div>
+ </div>
 
-<!--三个必要的js文件引入-->
+ <!--三个必要的js文件引入-->
 <script th:src="@{/hikcamera/jquery-1.12.4.min.js}"></script>
 <script th:src="@{/hikcamera/jsencrypt.min.js}"></script>
 <script th:src="@{/hikcamera/jsWebControl-1.0.0.min.js}"></script>