From 0526acc407572d23b1030e0ffd842406ae0bc121 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 16 Jul 2025 18:20:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pxb' into xin
---
oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnReasonServiceImpl.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnReasonServiceImpl.java b/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnReasonServiceImpl.java
index 5318bb5..8225f3c 100644
--- a/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnReasonServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/sh/service/impl/OrderReturnReasonServiceImpl.java
@@ -2,7 +2,6 @@
import com.oying.modules.sh.domain.OrderReturnReason;
import com.oying.utils.FileUtil;
-import com.oying.utils.enums.StatusEnum;
import lombok.RequiredArgsConstructor;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -72,7 +71,7 @@
Map<String, Object> map = new LinkedHashMap<>();
map.put("退货类型", orderReturnReason.getReasonName());
map.put("排序", orderReturnReason.getSort());
- map.put("状态", StatusEnum.getValue(orderReturnReason.getReasonStatus()));
+ map.put("状态", orderReturnReason.getReasonStatus() ? "启用" : "停用");
map.put("创建者", orderReturnReason.getCreateBy());
map.put("更新者", orderReturnReason.getUpdateBy());
map.put("创建日期", orderReturnReason.getCreateTime());
--
Gitblit v1.9.3