diff --git a/src/main/java/com/example/demo/domain/vo/coin/RefundUser.java b/src/main/java/com/example/demo/domain/vo/coin/RefundUser.java index a075a7b..a979e94 100644 --- a/src/main/java/com/example/demo/domain/vo/coin/RefundUser.java +++ b/src/main/java/com/example/demo/domain/vo/coin/RefundUser.java @@ -79,4 +79,6 @@ public class RefundUser { private Integer flag; //是否为员工号 @ExcelIgnore private Integer type; + @ExcelIgnore + private Integer isRefund; } diff --git a/src/main/resources/mapper/RefundMapper.xml b/src/main/resources/mapper/RefundMapper.xml index a87d783..1ac9aae 100644 --- a/src/main/resources/mapper/RefundMapper.xml +++ b/src/main/resources/mapper/RefundMapper.xml @@ -264,6 +264,7 @@ SELECT ugr.goods_name AS goodsName, + ugr.is_refund AS isRefund, ugr.order_code AS orderCode, ugr.permanent_gold AS permanentGold, (COALESCE(ugr.free_june, 0) + COALESCE(ugr.free_december, 0)) AS freeGold,