Merge remote-tracking branch 'upstream/master'

kmall-admin/src/main/java/com/kmall/admin/controller/mk/MkCenterMenuController.java

@@ -152,6 +152,9 @@ public class MkCenterMenuController {
         mkCenterMenuTreeDtos.add(dto);
         for (MkCenterMenuEntity mkCenterMenuEntity: list) {
             MkCenterMenuTreeDto mkCenterMenuTreeDto = new MkCenterMenuTreeDto();
+            if (Dict.isValid.item_1.getItem().equals(mkCenterMenuEntity.getIsValid())) {
+                continue;
+            }
             mkCenterMenuTreeDto.setCenterMenuId(mkCenterMenuEntity.getId());
             mkCenterMenuTreeDto.setParentId(0);
             mkCenterMenuTreeDto.setParentName("全部");