Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

Your Name

2023-02-21 e23023b93f34286f5a807b0b85e9a0619a297ed7

 service-common/src/main/java/com/java110/common/cmd/machine/ListMachinesCmd.java

@@ -90,6 +90,10 @@

        MachineDto machineDto = BeanConvertUtil.covertBean(reqJson, MachineDto.class);

        if (reqJson.containsKey("machineTypeCds") && !StringUtil.isEmpty(reqJson.getString("machineTypeCds"))) {
            machineDto.setMachineTypeCds(reqJson.getString("machineTypeCds").split(","));
        }

        int count = machineInnerServiceSMOImpl.queryMachinesCount(machineDto);

        List<ApiMachineDataVo> machines = null;