From fb4dd911979b692ff7ec8a0ba7e0f5ddce67ceb0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 19 十二月 2024 19:01:15 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/RefundPassInfo.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/RefundPassInfo.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/RefundPassInfo.java
index 36e81d5..6e9c89f 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/RefundPassInfo.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/RefundPassInfo.java
@@ -51,7 +51,7 @@
@ApiModelProperty("审核状态（1待审核2同意3拒绝）")
private Integer passStatus;
@ApiModelProperty("审核注释")
- private Integer passRemark;
+ private String passRemark;
@ApiModelProperty("售后申请时间")
private String passCreateTime;
@ApiModelProperty("售后类型（1退货退款2仅退款）")
--
Gitblit v1.7.1