Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-data-cloud into developer

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/vo/IndexItemVo.java

+package com.gic.cloud.web.vo;
+
+import java.io.Serializable;
+
+public class IndexItemVo implements Serializable {
+    private String id;
+    private String name;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/vo/StoreWidgetIndexVo.java

 package com.gic.cloud.web.vo;
 
+import java.util.List;
+
 public class StoreWidgetIndexVo {
     /****1多渠道首页   2单渠道线下首页   3单渠道线上首页****/
     private Integer type;
-    private String id;
-    private String name;
+    private List<IndexItemVo> items;
     private Integer attentionCount;
 
     public Integer getType() {
@@ -15,22 +16,6 @@ public class StoreWidgetIndexVo {
         this.type = type;
     }
 
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
     public Integer getAttentionCount() {
         return attentionCount;
     }
@@ -38,4 +23,12 @@ public class StoreWidgetIndexVo {
     public void setAttentionCount(Integer attentionCount) {
         this.attentionCount = attentionCount;
     }
+
+    public List<IndexItemVo> getItems() {
+        return items;
+    }
+
+    public void setItems(List<IndexItemVo> items) {
+        this.items = items;
+    }
 }