From c1d20b425b10e8ba59f102dd1ab413055883eed0 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Mon, 14 Jul 2025 16:57:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xin' into pxb
---
oying-system/src/main/java/com/oying/modules/message/domain/MessageOrderSeller.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/message/domain/MessageOrderSeller.java b/oying-system/src/main/java/com/oying/modules/message/domain/MessageOrderSeller.java
index 3f04170..d39132a 100644
--- a/oying-system/src/main/java/com/oying/modules/message/domain/MessageOrderSeller.java
+++ b/oying-system/src/main/java/com/oying/modules/message/domain/MessageOrderSeller.java
@@ -1,5 +1,6 @@
package com.oying.modules.message.domain;
+import com.oying.base.BaseEntity;
import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
import io.swagger.annotations.ApiModelProperty;
@@ -19,30 +20,38 @@
**/
@Data
@TableName("message_order_seller")
-public class MessageOrderSeller implements Serializable {
+public class MessageOrderSeller extends BaseEntity implements Serializable {
@TableId(value = "id", type = IdType.AUTO)
@ApiModelProperty(value = "id")
private Integer id;
- @NotNull
+ // 订单id String
@ApiModelProperty(value = "orderId")
- private Integer orderId;
+ private String orderId;
- @NotBlank
+
+ @ApiModelProperty(value = "storeId")
+ private Integer storeId;
+
+
@ApiModelProperty(value = "messageType")
private String messageType;
- @NotBlank
+
@ApiModelProperty(value = "messageContent")
private String messageContent;
- @NotBlank
+
@ApiModelProperty(value = "link")
private String link;
- @ApiModelProperty(value = "createTime")
- private Timestamp createTime;
+ //0未读 1已读
+ @ApiModelProperty(value = "flag")
+ private Integer flag=0;
+
+// @ApiModelProperty(value = "createTime")
+// private Timestamp createTime;
public void copy(MessageOrderSeller source){
BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
--
Gitblit v1.9.3