Merge branch 'master' of http://120.55.44.4:10080/xujunjie/gt_client_pad

解决冲突
# Conflicts:
#	src/pages/EqSelfInspection/components/Detail.js

src/pages/EqSelfInspection/components/Detail.js

@@ -1644,7 +1644,7 @@ function ReportDumCom(props) {
             pagination: false,
           }}
           backdrop="rgba(255,255,255,0.5)"
-          style={{ height: '0.9rem' }}
+          style={{ height: '90px' }}
           src={item.path}
         />
       ),