Merge branch 'master' of http://git.ycjcjy.com/nanyang/machinery-admin

config/config.js

@@ -8,9 +8,12 @@ const { REACT_APP_ENV } = process.env;
 
 export default defineConfig({
   define: {
-    API_BASE: 'http://sgl-v2.njyunzhi.com',
+    API_BASE: 'http://machine.njyunzhi.com',
   },
   hash: true,
+  history: {
+    type: 'hash',
+  },
   antd: {},
   dva: {
     hmr: true,