Merge branch 'dev_ren' into 'master'

1.12

See merge request !50

src/api/website/newsCategory/index.js

@@ -87,7 +87,7 @@ export function uploadFile(obj) {
  */
 export function uploadFileshuiy(obj) {
   return fetch({
-    url: '/api/universal/file/admin/uploadDispose?size=50&alpha=0.4',
+    url: '/api/universal/file/admin/uploadDispose?size=24&alpha=0.3&degree=-20',
     method: 'post',
     data: obj
   });