Merge branch 'g-master' into develop

# Conflicts:
#	public/0.js
#	public/11.js
#	public/12.js
#	public/app.js
#	public/mix-manifest.json

Author: osindex

config/admin.php

@@ -73,6 +73,8 @@
             'image' => 'images',
             'file' => 'files',
         ],
+        //文件上传类型
+        'mimes'=>'jpeg,bmp,png,gif,jpg',
     ],
     'database' => [
         // Database connection for following tables.