Merge branch 'haucheng_panzhihua' of http://gitlab.nhys.cdnhxx.com/root/zhi...

xiang

2023-09-14 66e4211cbfa154a87390b25c93b32d722e0d690c

 springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/service/impl/UnionOutdoorLaborDynamicServiceImpl.java

@@ -36,11 +36,14 @@
                case 1:
                case 2:
                case 3:
                case 4:
                    unionOutdoorLaborDynamicQueryWrapper.eq("type",unionOutdoorLaborDynamicDto.getType());
                    break;
            }
        }
        return R.ok( baseMapper.selectPage(page, unionOutdoorLaborDynamicQueryWrapper));
        Page pageResult = baseMapper.selectPage(page, unionOutdoorLaborDynamicQueryWrapper);
        pageResult.setTotal(pageResult.getRecords().size());
        return R.ok(pageResult);
    }

    /**