Merge branch 'master' of D:\workspace\ztqt with conflicts.

lyfO_o

2022-04-07 cb2e79e8374725da81b19c518405f1b91c86e601

 src/views/specialWork/taskInfo/components/reviewInfo/index.vue

@@ -47,7 +47,6 @@
        methods:{
            openReviewInfo(value){
                this.reviewInfoDialog = true
                debugger
                this.activities = JSON.parse(JSON.stringify(value.taskReviews))
                for(let i in this.activities){
                    if(this.activities[i].pictures !== null && this.activities[i].pictures.length !== 0){