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

src/views/system/login.vue

@@ -52,7 +52,7 @@
   } from '@/api/login'
   import {
     encryptedData
-  }
+  } from '@/api/encrypt'
   import Cookies from 'js-cookie'
 	import {
 		encrypt,