Merge https://gitee.com/wuxw7/MicroCommunity

wuxw

2024-01-11 28fe0e05d9f356a8d3ead011ecd56d8a97b22de7

Merge https://gitee.com/wuxw7/MicroCommunity

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

@@ -147,11 +147,15 @@
    public ResponseEntity<String> queryRentingConfig(
            @RequestParam(value = "page") int page,
            @RequestParam(value = "row") int row,
            @RequestParam(value = "rentingConfigId", required = false) String rentingConfigId) {
            @RequestParam(value = "rentingConfigId", required = false) String rentingConfigId,
            @RequestParam(value = "rentingType",required = false) String rentingType,
            @RequestParam(value = "rentingFormula",required = false) String rentingFormula) {
        RentingConfigDto rentingConfigDto = new RentingConfigDto();
        rentingConfigDto.setPage(page);
        rentingConfigDto.setRow(row);
        rentingConfigDto.setRentingConfigId(rentingConfigId);
        rentingConfigDto.setRentingType(rentingType);
        rentingConfigDto.setRentingFormula(rentingFormula);
        return getRentingConfigBMOImpl.get(rentingConfigDto);
    }