From 2116b5b5802c0de0f126f85cf2ac56a732639e82 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 02 Jul 2025 16:39:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin
---
oying-system/src/main/java/com/oying/modules/rider/domain/RiderOrderReminder.java | 65 ++++++++++++++++++++++++++++++++
1 files changed, 65 insertions(+), 0 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/rider/domain/RiderOrderReminder.java b/oying-system/src/main/java/com/oying/modules/rider/domain/RiderOrderReminder.java
new file mode 100644
index 0000000..8e48f45
--- /dev/null
+++ b/oying-system/src/main/java/com/oying/modules/rider/domain/RiderOrderReminder.java
@@ -0,0 +1,65 @@
+package com.oying.modules.rider.domain;
+
+import com.oying.base.BaseEntity;
+import lombok.Getter;
+import lombok.Setter;
+import cn.hutool.core.bean.BeanUtil;
+import io.swagger.annotations.ApiModelProperty;
+import cn.hutool.core.bean.copier.CopyOptions;
+import java.sql.Timestamp;
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+/**
+* @description /
+* @author pxb
+* @date 2025-06-18
+**/
+@Getter
+@Setter
+@TableName("qs_rider_order_reminder")
+public class RiderOrderReminder extends BaseEntity implements Serializable {
+
+ @TableId(value = "reminder_id", type = IdType.AUTO)
+ @ApiModelProperty(value = "订单提醒记录id")
+ private Long reminderId;
+
+ @ApiModelProperty(value = "骑手id")
+ private Long riderId;
+
+ @ApiModelProperty(value = "骑手名字")
+ private String riderName;
+
+ @ApiModelProperty(value = "骑手手机号")
+ private String riderPhone;
+
+ @ApiModelProperty(value = "订单Id")
+ private Long orderId;
+
+ @ApiModelProperty(value = "订单号")
+ private String orderNum;
+
+ @ApiModelProperty(value = "规则id")
+ private Long ruleId;
+
+ @ApiModelProperty(value = "规则内容")
+ private String ruleContent;
+
+ @ApiModelProperty(value = "规则类型。。。")
+ private String ruleType;
+
+ @ApiModelProperty(value = "提醒时间")
+ private Timestamp reminderTime;
+
+ @ApiModelProperty(value = "是否已发送：0-否，1-是")
+ private String isSent;
+
+ @ApiModelProperty(value = "发送时间")
+ private Timestamp sendTime;
+
+ public void copy(RiderOrderReminder source){
+ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
+ }
+}
--
Gitblit v1.9.3