廖井涛
2024-06-27 141def485bcfae95ca8ab925f8d9e3ed2cb2a75e
Merge branch 'master' of http://bore.pub:10439/r/ERP_override
2个文件已修改
2 ■■■■■ 已修改文件
north-glass-erp/northglass-erp/src/hook/index.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/hook/index.js
@@ -12,7 +12,6 @@
        if(column.field.indexOf('.')>-1){
            let  array = column.field.split('.')
            console.log(row[array[0]][array[1]])
            if (row[array[0]][array[1]]==null){
                return ''.indexOf(option.data) > -1
            }else {
north-glass-erp/src/main/java/com/example/erp/controller/userInfo/UserController.java
@@ -30,7 +30,6 @@
    @GetMapping
    public List<User> getUser(){
        System.out.println(cacheUtil.getCacheData("admin"));
        return userMapper.findAll();
    }
    @ApiOperation("登录")