Merge remote-tracking branch 'origin/master'

无关风月

2024-08-20 9f88b12d16c83963dad8fb8f79d9eeba2c311518

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	guns-admin/src/main/java/com/stylefeng/guns/modular/api/FileController.java
#	guns-admin/src/main/java/com/stylefeng/guns/modular/api/HouseResourceController.java
#	guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/HouseResourceMapper.xml
#	guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/HouseResource.java
#	guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/HouseResourceService.java
#	guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/HousingDemandServiceImpl.java

 guns-admin/pom.xml

@@ -77,9 +77,11 @@
            <version>1.0.6</version>
        </dependency>
        <!-- Aliyun OSS SDK -->
        <dependency><groupId>com.aliyun.oss</groupId>
        <dependency>
            <groupId>com.aliyun.oss</groupId>
            <artifactId>aliyun-sdk-oss</artifactId>
            <version>3.14.0</version></dependency>
            <version>3.17.4</version>
        </dependency>
        <!--spring boot依赖-->
        <dependency>
            <groupId>org.springframework.boot</groupId>

 guns-admin/src/main/java/com/stylefeng/guns/modular/api/FileController.java

 guns-admin/src/main/java/com/stylefeng/guns/modular/api/HouseResourceController.java

 guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/HouseResourceMapper.xml

 guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/HouseResource.java

 guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/HouseResourceService.java

 guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/HousingDemandServiceImpl.java

 guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/req/AddHouseReq.java

@@ -58,10 +58,11 @@
    private String cellName;
    @ApiModelProperty(value = "房源照片")
    private String housePhoto;
    @ApiModelProperty(value = "视频封面", required = true)
    @ApiModelProperty(value = "视频封面")
    private String videoPhoto;
    @ApiModelProperty(value = "房源视频")
    private String houseVideo;

    @ApiModelProperty(value = "标题", required = true)
    private String title;
    @ApiModelProperty(value = "更多介绍(求租描述)", required = true)
@@ -88,5 +89,11 @@
    private Integer building;
    @ApiModelProperty(value ="是否有泳池（0=否，1=是）")
    private Integer pool;
    @ApiModelProperty(value ="同时可租租金")
    private BigDecimal rentalMoney;
    @ApiModelProperty(value ="楼龄")
    private Integer age;
    @ApiModelProperty(value = "房源封面图片")
    private String headImg;

}

 guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/res/CollectListRes.java

@@ -87,5 +87,8 @@
    @ApiModelProperty("房源审核状态")
    private Integer authStatus;

    @ApiModelProperty("选择同时出租的租金 月")
    private BigDecimal rentalMoney;


}

 guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/res/HouseResourceInfoRes.java

@@ -76,5 +76,9 @@
    @ApiModelProperty("房屋朝向")
    private String buildingOrientation;

    @ApiModelProperty("同时可租 租金")
    private BigDecimal rentalMoney;
    @ApiModelProperty("楼龄")
    private Integer age;

}

 guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/res/SearchHouseResourceListRes.java

@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;

/**
@@ -17,7 +18,7 @@
    private Integer id;
    @ApiModelProperty("房源来源（2=个人房源，3=中介房源）")
    private Integer houseResource;
    @ApiModelProperty("封面图")
    @ApiModelProperty("图片")
    private String imgUrl;
    @ApiModelProperty("标题")
    private String title;
@@ -57,8 +58,11 @@
    private Integer keepPet;
    @ApiModelProperty("租期")
    private String leaseTime;
    @ApiModelProperty("房源封面图片")
    private String headImg;
    @ApiModelProperty("是否为平台添加")
    private Integer isManage;
    @ApiModelProperty("添加时间")
    private Date insertTime;

}

 guns-management/src/main/java/com/stylefeng/guns/modular/system/warpper/res/SearchHouseResourceListRes.java

@@ -4,6 +4,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

/**
 * @author zhibing.pu
 * @Date 2023/11/13 11:42
@@ -47,4 +49,5 @@
    private Integer balcony;
    @ApiModelProperty("是否可养宠物（0=否，1=是）")
    private Integer keepPet;

}