Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs

zjj

昨天 11e2b6d43b6c1664f74963649dad9507db34c6ae

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

@@ -67,7 +67,7 @@
        EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
        convert(param, wrapper);
        // 不同继承角色显示不同库信息
        RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper);
//        RoleUtils.addRoleWrapperByCrn(getUserId(),wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper));
    }