Merge remote-tracking branch 'origin/master'

cuilei

4 天以前 578639bf4bb9be9808d7c482345b8c35b02510b7

 src/main/java/org/jeecg/modules/andon/controller/AndonButtonConfigController.java

@@ -102,7 +102,18 @@
        return Result.OK(list);
    }


    /**
     * APP安灯已处理列表查询
     *
     * @param factoryId
     * @return
     */
    @ApiOperation(value = "安灯响应-分页列表查询", notes = "安灯响应-分页列表查询")
    @GetMapping(value = "/queryUserAndonHandelList")
    public Result<List<AndonButtonDTO>> queryUserAndonHandelList(@RequestParam("factoryId") String factoryId) {
        List<AndonButtonDTO> list = andonButtonConfigService.queryUserAndonHandelList(factoryId);
        return Result.OK(list);
    }
    /**
     * 添加
     *