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

Your Name

2023-07-11 d7d9b601b2e4fdb663375993e2cfbdbd363df421

 service-fee/src/main/java/com/java110/fee/cmd/fee/ListFeePayerObjCmd.java

@@ -156,6 +156,7 @@
        Assert.listOnlyOne(roomDtos, "房屋不存在");

        data.putAll(BeanConvertUtil.beanCovertJson(roomDtos.get(0)));
        data.put("payerObjName", roomDtos.get(0).getFloorNum() + "-" + roomDtos.get(0).getUnitNum() + "-" + roomDtos.get(0).getRoomNum());

        OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
        ownerRoomRelDto.setRoomId(roomDtos.get(0).getRoomId());
@@ -197,6 +198,8 @@
        Assert.listOnlyOne(ownerCarDtos, "车辆不存在");

        data.putAll(BeanConvertUtil.beanCovertJson(ownerCarDtos.get(0)));
        data.put("payerObjName", ownerCarDtos.get(0).getCarNum());


        OwnerDto ownerDto = new OwnerDto();
        ownerDto.setMemberId(ownerCarDtos.get(0).getOwnerId());
@@ -227,6 +230,7 @@
        Assert.listOnlyOne(contractDtos, "合同不存在");

        data.putAll(BeanConvertUtil.beanCovertJson(contractDtos.get(0)));
        data.put("payerObjName", contractDtos.get(0).getContractName());

        OwnerDto ownerDto = new OwnerDto();
        ownerDto.setLink(contractDtos.get(0).getbLink());