From b536b4e005a3aee7908a60c31eddff90bf4b98dc Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 07 八月 2021 22:20:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 service-fee/src/main/java/com/java110/fee/api/MeterWaterApi.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/service-fee/src/main/java/com/java110/fee/api/MeterWaterApi.java b/service-fee/src/main/java/com/java110/fee/api/MeterWaterApi.java
old mode 100644
new mode 100755
index c61c5fb..d5f9c02
--- a/service-fee/src/main/java/com/java110/fee/api/MeterWaterApi.java
+++ b/service-fee/src/main/java/com/java110/fee/api/MeterWaterApi.java
@@ -27,8 +27,8 @@
      */
     @RequestMapping(value = "/queryPreMeterWater", method = RequestMethod.GET)
     public ResponseEntity<String> queryPreMeterWater(@RequestParam(value = "communityId") String communityId,
-                                                     @RequestParam(value = "objId") String objId,
-                                                     @RequestParam(value = "objType") String objType,
+                                                     @RequestParam(value = "objId", required = false) String objId,
+                                                     @RequestParam(value = "objType", required = false) String objType,
                                                      @RequestParam(value = "roomNum", required = false) String roomNum,
                                                      @RequestParam(value = "meterType", required = false) String meterType) {
         MeterWaterDto meterWaterDto = new MeterWaterDto();

--
Gitblit v1.8.0