Merge branch 'dev-circle-live-20200715' into 'release'

裁剪缩放优化，code review:bo.dang



See merge request !204

src/utils/cropperjs/cropper.js

@@ -2789,9 +2789,9 @@
         // updated by bo.dang
         var ratio = imageData.width / imageData.naturalWidth;
         forEach(data, function (n, i) {
-          if(i == "x" || i == "y"){
+          // if(i == "x" || i == "y"){
             data[i] = n / ratio;
-          }
+          // }
         });
 
         if (rounded) {