Merge branch 'developer/yanjiaxu' into develop

.gitattributes

-* text eol=lf
+eol=lf
\ No newline at end of file

src/views/login.vue

@@ -89,7 +89,7 @@
 import { getCodeImg } from '@/api/login'
 import Cookies from 'js-cookie'
 import { encrypt, decrypt } from '@/utils/jsencrypt'
-import logoImg from '@/assets/logo/logo1.jpg'
+import logoImg from '@/assets/logo/logo.png'
 
 export default {
   name: 'Login',