Merge remote-tracking branch 'gitbit/hylyasrs' into hylyasrs

tqs

2022-09-12 fdd8b1d79a9c899a0ad6dde6c17bef0a8488e6b0

 src/main/java/com/zy/asrs/controller/ManLocDetlController.java

@@ -1,5 +1,6 @@
package com.zy.asrs.controller;

import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.DateUtils;
@@ -52,4 +53,18 @@
        }
        return R.ok(manLocDetlService.getPage(toPage(curr, limit, param, ManLocDetl.class)));
    }


    @RequestMapping("/manLocDetl/list")
    public R outList(@RequestParam(defaultValue = "1")Integer curr,
                     @RequestParam(defaultValue = "10")Integer limit,
                     @RequestParam(required = false)String orderByField,
                     @RequestParam(required = false)String orderByType,
                     @RequestParam Map<String, Object> param){

        Page<ManLocDetl> manLocDetlPage = toPage(curr, limit, param, ManLocDetl.class);
        Page<ManLocDetl> outPage = manLocDetlService.getOutPage(manLocDetlPage);
//        Page<ManLocDetl> page = manLocDetlService.getPage(manLocDetlPage);
        return R.ok(outPage);
    }
}