merge

2017-11-26 21:33:29 +08:00
parent 8510a58e90
commit e71ba5ed18
8 changed files with 43 additions and 37 deletions
@@ -29,8 +29,8 @@ public class SysUserLoginInOutControl {
    private SysUserLoginInOutService inOutService;

    @LogInfo("获取登录或登出信息")
-    @GetMapping("listByType")
    @ApiOperation(value = "获取登录或登出信息")
+    @GetMapping("listByType")
    public JSONObject listByType(@RequestParam int inout) {
        List<SysUserLoginInOut> sysUserLoginInOuts = inOutService.listByType(inout);
        return JSONObjResult.toJSONObj(sysUserLoginInOuts, true, "获取列表成功");