Merge branch 'develop' into lmm

src/app/views/inspect-search/inspect-search.component.html

@@ -57,7 +57,7 @@
             <td>{{data.inspectName||'-'}}</td>
             <td>{{ data.yyTime||'-' }}</td>
             <td>{{data.arriveTime||'-'}}</td>
-            <td>{{ data.arriveTime?'已检查':'待检查' }}</td>
+            <td>{{ data.inspectState?data.inspectState.name:''}}</td>
             <td>{{ data.workerName||'-' }}</td>
             <!-- <td><button (click)="viewSpecimenHistory(data)">查看</button></td> -->
           </tr>