Merge remote-tracking branch 'origin/dev' into dev

src/pages/Container/EnterpriseInfo/equipPageQuery.js

@@ -0,0 +1,8 @@
+/** 装备信息列表查询参数：仅查询启用设备，忽略前端状态筛选 */
+export function toEquipPageQuery(query = {}) {
+  const { enableFlag, ...rest } = query;
+  return {
+    ...rest,
+    enableFlag: 1,
+  };
+}