From b69f7d42b91856b9448676a51eefef6b36f6bdb3 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期四, 13 二月 2025 10:30:49 +0800 Subject: [PATCH] Merge branch 'master' of https://gitee.com/xiaochen991015/xizang --- ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TBillController.java | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TBillController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TBillController.java index 98558e2..a16749f 100644 --- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TBillController.java +++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TBillController.java @@ -90,9 +90,14 @@ billVO.setHouse(houseService.getById(contract.getHouseId())); billVO.setMonthRent(contract.getMonthRent()); billVO.setPayType(contract.getPayType()); + billVO.setDeposit(contract.getDeposit()); + billVO.setPartyOnePerson(contract.getPartyOnePerson()); + billVO.setPartyOnePhone(contract.getPartyOnePhone()); + billVO.setConcatStartTime(contract.getStartTime()); + billVO.setConcatEndTime(contract.getEndTime()); }); billVO.setBillType(DictUtils.getDictLabel(DictConstants.DICT_TYPE_BILL_TYPE,billVO.getBillType())); - billVO.setPayFeesStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_PAY_FEES_STATUS,billVO.getPayFeesStatus())); +// billVO.setPayFeesStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_PAY_FEES_STATUS,billVO.getPayFeesStatus())); return R.ok(billVO); } -- Gitblit v1.7.1