Merge branch 'master' into develop

src/app/views/inspect-active-detail/inspect-active-detail.component.html

@@ -31,7 +31,7 @@
           <td>{{data.count4}}</td>
           <td>
             <div class="coop">
-              <span (click)="integralDetail(data)">查看</span>
+              <span *ngIf="data.userId" (click)="integralDetail(data)">查看</span>
             </div>
           </td>
         </tr>