From 94ae02e6f73b7011f0fcf6acff8636341d35351d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 15 一月 2025 17:24:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/entity/RecoveryClassify.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/entity/RecoveryClassify.java b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/entity/RecoveryClassify.java
index 08b4069..a91252b 100644
--- a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/entity/RecoveryClassify.java
+++ b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/entity/RecoveryClassify.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -24,7 +25,7 @@
@ApiModel(value = "RecoveryClassify对象", description = "回收分类表")
public class RecoveryClassify extends BaseEntity {
- @TableId(value = "id",type = IdType.AUTO)
+ @TableId(value = "id", type = IdType.AUTO)
private Integer id;
@ApiModelProperty("上级分类名称")
@@ -44,12 +45,12 @@
private String classificationPicture;
@ApiModelProperty("分类描述")
- @TableField("describe")
- private String describe;
+ @TableField("type_describe")
+ private String typeDescribe;
@ApiModelProperty("排序权重")
- @TableField("order")
- private Integer order;
+ @TableField("sort")
+ private Integer sort;
@ApiModelProperty("分类简介")
@TableField("brief_introduction")
@@ -59,4 +60,11 @@
@TableField("is_recommend")
private Integer isRecommend;
+ @ApiModelProperty("服务类型(0:以旧换新，1:家电回收)")
+ @TableField(exist = false)
+ private Integer type;
+
+ public Integer getType() {
+ return supClassify.equals(Constants.TRADE_IN) ? Constants.ZERO : Constants.ONE;
+ }
}
--
Gitblit v1.7.1