From ec37a0bddbec09bab3eb23e7858a9a6a633d28c6 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Thu, 05 May 2022 16:21:25 +0800 Subject: [PATCH] 20220505 --- zq-erp/src/main/java/com/matrix/system/app/vo/OrderDetailItemVo.java | 10 ++++++++++ zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderItemDao.xml | 1 + 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/OrderDetailItemVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/OrderDetailItemVo.java index 6fb4768..bcec1e2 100644 --- a/zq-erp/src/main/java/com/matrix/system/app/vo/OrderDetailItemVo.java +++ b/zq-erp/src/main/java/com/matrix/system/app/vo/OrderDetailItemVo.java @@ -22,6 +22,9 @@ @ApiModelProperty(value = "数量") private String count; + @ApiModelProperty(value = "产品类型") + private String type; + @ApiModelProperty(value = "现金支付") private BigDecimal cashPay; @@ -43,6 +46,13 @@ @ApiModelProperty(value = "订单业绩") private List<OrderDetailAchieveItemVo> achieves; + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } public Long getId() { return id; } diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderItemDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderItemDao.xml index f3fa230..9d27ee7 100644 --- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderItemDao.xml +++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderItemDao.xml @@ -541,6 +541,7 @@ a.card_Pay cardPay, a.PRICE price, a.ZK_PRICE zkPrice, + a.type type, a.status status from sys_order_item a inner join shopping_goods b on a.goods_id=b.id -- Gitblit v1.9.1