Merge remote-tracking branch 'origin/master'

zhanzhiqin

2022-09-16 8567b31b38b222426468d1d677fea9cf915fb90e

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

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

        if (baseConditionVO != null) {
            PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());