Merge branch 'master' into uat(dev)

src/components/deleteUploadImgTaskPhoto.vue

@@ -283,6 +283,8 @@ export default {
 
 <style lang="scss" scoped>
 .deleteUploadImgTaskPhoto {
+  height: 180px;
+  overflow-y: auto;
   margin-left: 20px;
 }
 .addImg {