From 3ae4185bbca1512fcdce9e461a3ed6160790242b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 06 三月 2025 17:10:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java
index 2b9f010..d09d7fa 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java
@@ -352,6 +352,12 @@
TContract contract = contractService.getById(bill.getContractId());
THouse tHouse = houseService.getById(contract.getHouseId());
res.setHouse(tHouse);
+ res.setConcatStartTime(contract.getStartTime());
+ res.setConcatEndTime(contract.getEndTime());
+ res.setPartyOnePhone(contract.getPartyOnePhone());
+ res.setPartyOnePerson(contract.getPartyTwoPerson());
+ res.setMonthRent(bill.getPayableFeesMoney());
+ res.setPayType(DictUtils.getDictLabel(DictConstants.DICT_TYPE_CONTRACT_PAY_TYPE,contract.getPayType()));
return R.ok(res);
}
@ApiOperation(value = "管理员-我的审批分页列表")
--
Gitblit v1.7.1