Merge remote-tracking branch 'origin/master'

src/main/webapp/app/overAll/basic/basic-detail/basic-detail.component.ts

@@ -787,8 +787,11 @@ export class BasicDetailComponent implements OnInit, AfterViewInit {
                     applicationid:'',
                     name:'全部'
                 }
+                if (null!=res.data){
                     this.itemTypeList.push(data);
                 }
+
+            }
         );
     }