From cda724da35beb1ffd84955cc42bda5ab399ebbe1 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 09 四月 2025 18:27:38 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou
---
ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/entity/RecoveryServe.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/entity/RecoveryServe.java b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/entity/RecoveryServe.java
index fdec4e3..7a1e230 100644
--- a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/entity/RecoveryServe.java
+++ b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/entity/RecoveryServe.java
@@ -26,7 +26,7 @@
@ApiModel(value = "RecoveryServe对象", description = "回收服务列表")
public class RecoveryServe extends BaseEntity {
- @TableId(value = "id",type = IdType.AUTO)
+ @TableId(value = "id", type = IdType.AUTO)
private Integer id;
@ApiModelProperty("所属分类id")
@@ -43,15 +43,15 @@
@ApiModelProperty("预估价格")
@TableField("estimate_price")
- private BigDecimal estimatePrice;
+ private String estimatePrice;
@ApiModelProperty("默认回收价")
@TableField("default_price")
private BigDecimal defaultPrice;
@ApiModelProperty("排序权重")
- @TableField("order")
- private Integer order;
+ @TableField("sort")
+ private Integer sort;
@ApiModelProperty("封面图片")
@TableField("cover")
@@ -61,4 +61,12 @@
@TableField("rotate")
private String rotate;
+ @ApiModelProperty("是否收藏")
+ @TableField(exist = false)
+ private Boolean isCollect;
+
+ @ApiModelProperty("服务类型(0:以旧换新，1:家电回收)")
+ @TableField(exist = false)
+ private Integer type;
+
}
--
Gitblit v1.7.1