From ab4ea7b8f10c9b66aed9c2ea161a08b25c3851a7 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 30 四月 2024 19:11:37 +0800
Subject: [PATCH] 2024.04新增内容
---
meiya-admin/src/main/java/com/sinata/modular/mall/model/MallOrder.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/meiya-admin/src/main/java/com/sinata/modular/mall/model/MallOrder.java b/meiya-admin/src/main/java/com/sinata/modular/mall/model/MallOrder.java
index ccb5f97..552bea9 100644
--- a/meiya-admin/src/main/java/com/sinata/modular/mall/model/MallOrder.java
+++ b/meiya-admin/src/main/java/com/sinata/modular/mall/model/MallOrder.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.annotations.TableLogic;
import com.baomidou.mybatisplus.annotations.TableName;
import com.sinata.common.enums.mall.EnumMallOrderState;
+import com.sinata.modular.mall.model.vo.VoUseOrderDetailGroupSpec;
import com.sinata.modular.system.model.MallOrderDetailUse;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -268,16 +269,21 @@
private String stateName;
@TableField(exist = false)
+ private String saleNickName;
+
+ @TableField(exist = false)
private String saleUserName;
@TableField(exist = false)
private String saleShowId;
-
@TableField(exist = false)
@ApiModelProperty(value = "核销记录")
private List<MallOrderDetailUse> useList;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "核销商品列表")
+ private List<VoUseOrderDetailGroupSpec> useOrderDetailGroupSpecList;
public String getStateName() {
return EnumMallOrderState.getMarkByIndex(state);
--
Gitblit v1.7.1