From 14f8be1a86a3d852b92665fcf4c767478c3e12d2 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 17 五月 2024 16:52:17 +0800
Subject: [PATCH] Merge branch 'master' into dev-mitao
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/MemberCollection.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/MemberCollection.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/MemberCollection.java
index 18d064c..5e2578b 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/MemberCollection.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/MemberCollection.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.enums.CollectionTypeEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -35,7 +36,7 @@
private Long id;
@ApiModelProperty(value = "收藏类型1=商城商品 2=资讯文章 3=普通拍品")
- private Integer collectionType;
+ private CollectionTypeEnum collectionType;
@ApiModelProperty(value = "收藏目标id")
private Long targetId;
--
Gitblit v1.7.1