Merge branch 'dev_trial' of https://gitea.free-sun.vip/free-sun/FS-IOT into dev_trial

code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/nvrCamera.jsx

@@ -259,7 +259,7 @@ function nvrCamera ({ dispatch, actions, nvrRef, cameraData, addNvr, nvrNumber }
                     >
                         视频流获取
                     </Button>
-                    {NVRcameraList.length > 0 ? (
+                    {stepp!=='none' ? (
                         <div
                             style={{ display: "flex", alignItems: "center", marginLeft: 211 }}
                         >