Merge branch 'develop' into test

miniprogram/pages/equipment/equipment.ts

@@ -58,11 +58,15 @@ Page({
       });
   },
   fetchWarningCount() {
+    let data =
+      app.globalData.userInfo.operateId === 3
+        ? undefined
+        : {
+            operatorId: app.globalData.userInfo.operateId,
+          };
     deviceFetch({
       url: '/device/warning/count',
-      data: {
-        operatorId: app.globalData.userInfo.operateId,
-      },
+      data: data,
     })
       .then(res => {
         this.setData!({