Merge branch 'pxb' into xin

xin

5 days ago 044a57d2133b2363a6f0d3d167b3eaa587c70b91

 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());