Merge remote-tracking branch 'origin/develop' into develop

src/pages/details/complianceDetails/index.vue

@@ -43,7 +43,7 @@
           </template>
         </el-table-column>
         <el-table-column
-          prop="evaluationPeople"
+          prop="evaluationPeopleName"
           label="评估人"
           width="160"
           align="center"
@@ -88,7 +88,7 @@
          >
          </el-table-column>
          <el-table-column
-           prop="evaluationPeople"
+           prop="evaluationPeopleName"
            label="评估人"
            width="160"
            align="center"
@@ -126,13 +126,13 @@
       >
       </el-table-column>
       <el-table-column
-        prop="researchNonCompliance"
+        prop="noInvolve"
         label="不涉及"
         align="center"
       >
       </el-table-column>
       <el-table-column
-        prop="evaluationPeople"
+        prop="evaluationPeopleName"
         label="评估人"
         width="160"
         align="center"