From bb133d1e82c337da646e90740b82584b82f9a0e6 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 四月 2020 10:03:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/dto/common/GoodsOtherInfoDTO.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dto/common/GoodsOtherInfoDTO.java b/fanli/src/main/java/com/yeshi/fanli/dto/common/GoodsOtherInfoDTO.java
index 808fdbb..6442b27 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dto/common/GoodsOtherInfoDTO.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dto/common/GoodsOtherInfoDTO.java
@@ -5,17 +5,30 @@
public class GoodsOtherInfoDTO {
private String owner;// 浜笢- g=鑷惀锛宲=pop
private JDPingouInfo pinGouInfo;// 浜笢-鎷艰喘淇℃伅
-
+ private Integer isFreeShipping; // 鏄惁鍖呴偖(1:鏄�,0:鍚�,2:鑷惀鍟嗗搧閬典粠涓荤珯鍖呴偖瑙勫垯)
+
public String getOwner() {
return owner;
}
+
public void setOwner(String owner) {
this.owner = owner;
}
+
public JDPingouInfo getPinGouInfo() {
return pinGouInfo;
}
+
public void setPinGouInfo(JDPingouInfo pinGouInfo) {
this.pinGouInfo = pinGouInfo;
}
+
+ public Integer getIsFreeShipping() {
+ return isFreeShipping;
+ }
+
+ public void setIsFreeShipping(Integer isFreeShipping) {
+ this.isFreeShipping = isFreeShipping;
+ }
+
}
--
Gitblit v1.8.0