merge upstream

api/100J/HBY100-J.js

@@ -0,0 +1,8 @@
+import request from '@/utils/request'
+// 获取设备详细信息
+export function deviceDetail(id) {
+  return request({
+    url: `/app/bjq/device/${id}`,
+    method: 'get',
+  })
+}

pages.json

@@ -390,6 +390,13 @@
 			{
 				"navigationStyle": "custom"				
 			}
+		},
+		{
+			"path" : "pages/100J/HBY100-J",
+			"style" : 
+			{
+				"navigationStyle": "custom"	
+			}
 		}