Merge remote-tracking branch 'origin/master'

fengxiang

2018-02-05 f1e25082a58c8cb57dd45d226d3a94f4af4a0677

 src/main/java/com/moral/controller/MonitorPointController.java

@@ -35,7 +35,7 @@
     */
    @GetMapping("get-by-id")
    public ResultBean getById(Integer id){
        MonitorPoint monitorPoint = monitorPointService.selectWithRelationById(id);
        MonitorPoint monitorPoint = monitorPointService.queryWithRelationById(id);
        ResultBean resultBean = new ResultBean(ResultBean.SUCCESS);
        resultBean.setData(monitorPoint);
        return resultBean;