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

Your Name

2023-07-11 d7d9b601b2e4fdb663375993e2cfbdbd363df421

 service-user/src/main/java/com/java110/user/api/RentingAppointmentApi.java

old mode 100644
new mode 100755
@@ -1,8 +1,9 @@
package com.java110.user.api;

import com.alibaba.fastjson.JSONObject;
import com.java110.dto.rentingAppointment.RentingAppointmentDto;
import com.java110.po.rentingAppointment.RentingAppointmentPo;
import com.java110.dto.renting.RentingAppointmentDto;
import com.java110.dto.store.StoreDto;
import com.java110.po.renting.RentingAppointmentPo;
import com.java110.user.bmo.rentingAppointment.*;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -115,7 +116,9 @@
        RentingAppointmentDto rentingAppointmentDto = new RentingAppointmentDto();
        rentingAppointmentDto.setPage(page);
        rentingAppointmentDto.setRow(row);
        rentingAppointmentDto.setStoreId(storeId);
        if (!StoreDto.STORE_ADMIN.equals(storeId)) {
            rentingAppointmentDto.setStoreId(storeId);
        }
        rentingAppointmentDto.setState(state);
        rentingAppointmentDto.setTenantName(tenantName);
        rentingAppointmentDto.setTenantTel(tenantTel);