Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.env.development
#	.env.production

src/api/system/instruction.js

@@ -8,4 +8,12 @@ export function executeInstruction(data) {
   })
 }
 
+export function getHistory(type, limit) {
+  return request({
+    url: '/jarvis/instruction/history',
+    method: 'get',
+    params: { type, limit }
+  })
+}
+