From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-user/src/main/java/com/java110/user/api/RentingApi.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/api/RentingApi.java b/service-user/src/main/java/com/java110/user/api/RentingApi.java
old mode 100644
new mode 100755
index 5b8972b..17846ea
--- a/service-user/src/main/java/com/java110/user/api/RentingApi.java
+++ b/service-user/src/main/java/com/java110/user/api/RentingApi.java
@@ -4,13 +4,13 @@
import com.alibaba.fastjson.JSONObject;
import com.aliyuncs.utils.StringUtils;
import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.dto.rentingConfig.RentingConfigDto;
-import com.java110.dto.rentingPool.RentingPoolDto;
-import com.java110.dto.rentingPoolAttr.RentingPoolAttrDto;
-import com.java110.po.rentingConfig.RentingConfigPo;
-import com.java110.po.rentingPool.RentingPoolPo;
-import com.java110.po.rentingPoolAttr.RentingPoolAttrPo;
-import com.java110.po.rentingPoolFlow.RentingPoolFlowPo;
+import com.java110.dto.renting.RentingConfigDto;
+import com.java110.dto.renting.RentingPoolDto;
+import com.java110.dto.renting.RentingPoolAttrDto;
+import com.java110.po.renting.RentingConfigPo;
+import com.java110.po.renting.RentingPoolPo;
+import com.java110.po.renting.RentingPoolAttrPo;
+import com.java110.po.renting.RentingPoolFlowPo;
import com.java110.user.bmo.rentingConfig.IDeleteRentingConfigBMO;
import com.java110.user.bmo.rentingConfig.IGetRentingConfigBMO;
import com.java110.user.bmo.rentingConfig.ISaveRentingConfigBMO;
@@ -204,8 +204,7 @@
Assert.hasKeyAndValue(reqJson, "roomId", "璇锋眰鎶ユ枃涓湭鍖呭惈roomId");
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
Assert.hasKeyAndValue(reqJson, "price", "璇锋眰鎶ユ枃涓湭鍖呭惈price");
- Assert.hasKeyAndValue(reqJson, "paymentType", "璇锋眰鎶ユ枃涓湭鍖呭惈paymentType");
- Assert.hasKeyAndValue(reqJson, "checkInDate", "璇锋眰鎶ユ枃涓湭鍖呭惈checkInDate");
+ Assert.hasKeyAndValue(reqJson, "checkIn", "璇锋眰鎶ユ枃涓湭鍖呭惈checkInDate");
Assert.hasKeyAndValue(reqJson, "rentingConfigId", "璇锋眰鎶ユ枃涓湭鍖呭惈rentingConfigId");
Assert.hasKeyAndValue(reqJson, "ownerName", "璇锋眰鎶ユ枃涓湭鍖呭惈ownerName");
Assert.hasKeyAndValue(reqJson, "ownerTel", "璇锋眰鎶ユ枃涓湭鍖呭惈ownerTel");
--
Gitblit v1.8.0