From 2a4dc73c59eae1e14b0e0660bf04652fa3d322ad Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Wed, 07 Apr 2021 12:06:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/java/com/matrix/system/app/dto/ShoppingGoodsListDto.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/dto/ShoppingGoodsListDto.java b/zq-erp/src/main/java/com/matrix/system/app/dto/ShoppingGoodsListDto.java
index e98ca7d..b83e7a3 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/dto/ShoppingGoodsListDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/dto/ShoppingGoodsListDto.java
@@ -15,6 +15,9 @@
@ApiModelProperty(value = "商品名称/编号/拼音")
private String queryKey;
+ @ApiModelProperty(value = "商品类型")
+ private String goodType;
+
@ApiModelProperty(value = "类型ID", example = "13")
private Long cateId;
@@ -29,6 +32,25 @@
@ApiModelProperty(hidden = true)
private Long shopId;
+ @ApiModelProperty(hidden = true)
+ private Long companyId;
+
+ public Long getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Long companyId) {
+ this.companyId = companyId;
+ }
+
+ public String getGoodType() {
+ return goodType;
+ }
+
+ public void setGoodType(String goodType) {
+ this.goodType = goodType;
+ }
+
public Long getShopId() {
return shopId;
}
--
Gitblit v1.9.1