Merge remote-tracking branch 'refs/remotes/origin/dev' into dev

yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerServiceImpl.java

@@ -1339,9 +1339,9 @@ public class PractitionerServiceImpl implements com.yd.api.practitioner.service.
 //            double width = img.getWidth(null);
 //            double height = img.getHeight(null);
 //            double value =height/width;
-//            ByteArrayOutputStream os = new ByteArrayOutputStream();
-//            ImageIO.write(img, "jpg", os);
-//            inputStream = new ByteArrayInputStream(os.toByteArray());
+            ByteArrayOutputStream os = new ByteArrayOutputStream();
+            ImageIO.write(img, "jpg", os);
+            inputStream = new ByteArrayInputStream(os.toByteArray());
 //            if (value !=1&&(targetUseFor == 1 || targetUseFor == 9)){
 //                //上传头像尺寸比例为1:1
 //                return ZHBErrorConfig.getErrorInfo("830005");