From 88ac2574d89aed7c28b9c0370b19b8bb2d0364eb Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期二, 07 一月 2025 19:02:34 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TOrderAppeal.java | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 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 344daa0..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; @@ -70,9 +72,13 @@ @ApiModelProperty(value = "申诉反馈") @TableField("feedback") private String feedback; - @TableField(exist = false) - private String uid; + @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