Merge branch 'dev-patients-20190513' into release-0612

build/webpack.base.conf.js

@@ -72,4 +72,4 @@ module.exports = {
             })
         ]
     }
-}
+}
\ No newline at end of file

src/main.js

@@ -8,7 +8,7 @@ import FastClick from 'fastclick'
 import vueFilters from '@/utils/filter'
 
 // 引入ElementUI
-import ElementUI from 'element-ui'
+import ElementUI from 'element-ui';
 import 'element-ui/lib/theme-chalk/index.css';
 //引入滚动加载分页
 import infiniteScroll from 'vue-infinite-scroll'