From c4664502dfdaffff555b532e65b51a57ac8b29c2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 十月 2024 17:51:32 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TOrderAppeal.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TOrderAppeal.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TOrderAppeal.java
index 0408457..344daa0 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TOrderAppeal.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TOrderAppeal.java
@@ -28,12 +28,16 @@
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主键")
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "id", type = IdType.NONE)
private Long id;
@ApiModelProperty(value = "订单类型（1=充电订单，2=购物订单，3=兑换订单，4=会员订单）")
@TableField("order_type")
private Integer orderType;
+
+ @ApiModelProperty(value = "订单编号")
+ @TableField("code")
+ private String code;
@ApiModelProperty(value = "订单id")
@TableField("order_id")
@@ -47,6 +51,10 @@
@TableField("reason")
private String reason;
+ @ApiModelProperty(value = "联系方式")
+ @TableField("phone")
+ private String phone;
+
@ApiModelProperty(value = "申诉内容")
@TableField("content")
private String content;
@@ -55,9 +63,15 @@
@TableField("img_url")
private String imgUrl;
+ @ApiModelProperty(value = "申诉状态 (1=待处理,2=已处理)")
+ @TableField("status")
+ private Integer status;
+
@ApiModelProperty(value = "申诉反馈")
@TableField("feedback")
private String feedback;
+ @TableField(exist = false)
+ private String uid;
@ApiModelProperty(value = "反馈人id")
@TableField("feedback_user_id")
--
Gitblit v1.7.1