Merge remote-tracking branch 'origin/base-modify' into base-modify

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleModel.java

@@ -112,7 +112,7 @@ public class VehicleModel implements Serializable {
 	@ApiModelProperty(value = "评分")
 	private Integer score;
 
-	@Column(name = "热度标记，1--热门；2--非热门")
+	@Column(name = "hot_sign")
 	@ApiModelProperty(value = "热度标记，1--热门；2--非热门")
 	Integer hotSign;
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

@@ -842,7 +842,11 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
         if(StrUtil.isNotBlank(dto.getStartDate()) && StrUtil.isNotBlank(dto.getEndDate())) {
             initBookSearchParam(dto, params);
         }
-        return PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), () -> mapper.searchUsableModel(params));
+        PageHelper.startPage(dto.getPage(), dto.getLimit());
+        List<UsableVehicleModelVO> lists = mapper.searchUsableModel(params);
+        PageInfo<UsableVehicleModelVO> usableVehicleModel = new PageInfo<>(lists);
+        return PageDataVO.pageInfo(usableVehicleModel);
+        //return PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), () -> mapper.searchUsableModel(params));
     }
 
     public PageDataVO<UsableVehicleModelVO> hotModel(HotVeicleDTO dto){