From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/dto/pdd/PDDGoodsDetail.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/dto/pdd/PDDGoodsDetail.java b/fanli/src/main/java/com/yeshi/fanli/dto/pdd/PDDGoodsDetail.java
index 19fa7a9..23fd994 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dto/pdd/PDDGoodsDetail.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dto/pdd/PDDGoodsDetail.java
@@ -98,8 +98,27 @@
private String salesTip;// 妯＄硦閿�閲�
@SerializedName("activity_type")
private Integer activityType;// 娲诲姩绫诲瀷锛�0-鏃犳椿鍔�;1-绉掓潃;3-闄愰噺鎶樻墸;12-闄愭椂鎶樻墸;13-澶т績娲诲姩;14-鍚嶅搧鎶樻墸;15-鍝佺墝娓呬粨;16-椋熷搧瓒呭競;17-涓�鍏冨垢杩愬洟;18-鐖遍�涜;19-鏃跺皻绌挎惌;20-鐢蜂汉甯�;21-9鍧�9;22-绔炰环娲诲姩;23-姒滃崟娲诲姩;24-骞歌繍鍗婁环璐�;25-瀹氶噾棰勫敭;26-骞歌繍浜烘皵璐�;27-鐗硅壊涓婚娲诲姩;28-鏂爜娓呬粨;29-涓�鍏冭瘽璐�;30-鐢靛櫒鍩�;31-姣忔棩濂藉簵;32-鍝佺墝鍗�;101-澶т績鎼滅储姹�;102-澶т績鍝佺被鍒嗕細鍦�;
-
+ @SerializedName("mall_id")
+ private Long mallId;//搴楅摵ID
// mall_id:4217177,cps_sign:null,cat_id:null mall_rate:10
+
+ private Integer state;//鐘舵�� 1-涓嬬嚎 0-姝ｅ父
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
+ public Long getMallId() {
+ return mallId;
+ }
+
+ public void setMallId(Long mallId) {
+ this.mallId = mallId;
+ }
public Long getGoodsId() {
return goodsId;
--
Gitblit v1.8.0