Merge branch 'JUN'

重庆迈尖科技有限公司

2018-08-13 70bcf509bc1016fd9cdb824a8d4f6de54695c79c

Merge branch 'JUN'

# Conflicts:
#	MIduo.xcworkspace/xcuserdata/mj.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

 MIduo/界面/SJBaseViewController.m

@@ -262,6 +262,17 @@
            NSLog(@"%d",[self datasourceIsNull]);
            [_noNetworkView setHidden:YES];
        }
        // 棣栭〉鐗规湁
        if ([self homeIsShowNetWorkView]) {
            
            [self loadNoNetworkView];
            NSLog(@"%d",[self datasourceIsNull]);
            
        } else {
            
            [_noNetworkView setHidden:YES];
            [self loadData];
        }
    }
}