Merge remote-tracking branch 'origin/master'

liuhaonan

2022-08-02 74a6454275dc8539b0369b67e7914633d47a9253

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/InnerFrameDataService.java

@@ -37,6 +37,7 @@
        if (operation != null && operation.trim().length() != 0) {
            lambdaQueryWrapper.like(InnerFrameData::getOperation, operation);
        }
        lambdaQueryWrapper.orderByDesc(InnerFrameData::getId);

        if (baseConditionVO != null) {
            PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
@@ -71,4 +72,7 @@
    }


    public List<String> operationList() {
        return baseMapper.operationList();
    }
}