From d85af61932a03bd03663daf9da33177af5824a5c Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 14:09:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger
---
zq-erp/src/main/java/com/matrix/system/app/vo/ShoppingGoodsListVo.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/ShoppingGoodsListVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/ShoppingGoodsListVo.java
index 48504ed..ae87478 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/ShoppingGoodsListVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/ShoppingGoodsListVo.java
@@ -1,5 +1,6 @@
package com.matrix.system.app.vo;
+import com.matrix.system.hive.bean.ShoppingGoods;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -35,6 +36,17 @@
@ApiModelProperty(value = "商品图片")
private String img;
+
+ @ApiModelProperty(value = "商品类型")
+ private String goodsType;
+
+ public String getGoodsType() {
+ return goodsType;
+ }
+
+ public void setGoodsType(String goodsType) {
+ this.goodsType = goodsType;
+ }
public Long getId() {
return id;
@@ -73,7 +85,11 @@
}
public void setIsPresent(String isPresent) {
- this.isPresent = isPresent;
+ if ("是".equals(isPresent)) {
+ this.isPresent = "1";
+ } else {
+ this.isPresent = "0";
+ }
}
public String getUnit() {
--
Gitblit v1.9.1