Merge branch 'master' into uat(dev)

src/components/deleteUploadImgTaskPhoto.vue

@@ -264,6 +264,7 @@ export default {
   max-height: 180px;
   overflow-y: auto;
   margin-left: 20px;
+  padding: 5px;
 }
 .addImg {
   height: 88px;