From 37d2350961bc16543d28e2c9c158dfb2c3734d73 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 05 二月 2025 15:05:32 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TOrderAppeal.java | 10 +++++++++-
1 files changed, 9 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 29320fa..ec0c2c5 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
@@ -30,7 +30,9 @@
@ApiModelProperty(value = "主键")
@TableId(value = "id", type = IdType.NONE)
private Long id;
-
+ @ApiModelProperty(value = "uid")
+ @TableField(exist = false)
+ private String uid;
@ApiModelProperty(value = "订单类型(1=充电订单,2=购物订单,3=兑换订单,4=会员订单)")
@TableField("order_type")
private Integer orderType;
@@ -71,6 +73,12 @@
@TableField("feedback")
private String feedback;
+ @ApiModelProperty(value = "查看按钮权限 ")
+ @TableField(exist = false)
+ private Boolean authInfo = true;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "处理按钮权限 ")
+ private Boolean authHandle = true;
@ApiModelProperty(value = "反馈人id")
@TableField("feedback_user_id")
private Integer feedbackUserId;
--
Gitblit v1.7.1