Merge branch 'xgh_内容中台' into developer

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/content/ContentColumnInfoVO.java

 package com.gic.haoban.manage.web.vo.content;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
 import java.io.Serializable;
 import java.util.List;
 
@@ -15,6 +18,7 @@ public class ContentColumnInfoVO implements Serializable {
     /**
      * 栏目id
      */
+    @JsonSerialize(using = ToStringSerializer.class)
     private Long contentColumnId;
 
     /**

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/content/ContentMaterialInfoVO.java

 package com.gic.haoban.manage.web.vo.content;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
@@ -16,7 +19,8 @@ public class ContentMaterialInfoVO implements Serializable {
     /**
      * 素材id
      */
-    private Integer contentMaterialId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long contentMaterialId;
 
     /**
      * 素材标题
@@ -61,12 +65,13 @@ public class ContentMaterialInfoVO implements Serializable {
     /**
      * 分享次数
      */
-    private Integer shareCount;
+    private Long shareCount;
 
     /**
      * 发布人id
      */
-    private String producerId;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long producerId;
 
     /**
      * 发布人头像
@@ -84,11 +89,11 @@ public class ContentMaterialInfoVO implements Serializable {
     private List<SimpleGoodsInfoVO> contentGoodsList;
 
 
-    public Integer getContentMaterialId() {
+    public Long getContentMaterialId() {
         return contentMaterialId;
     }
 
-    public void setContentMaterialId(Integer contentMaterialId) {
+    public void setContentMaterialId(Long contentMaterialId) {
         this.contentMaterialId = contentMaterialId;
     }
 
@@ -156,19 +161,19 @@ public class ContentMaterialInfoVO implements Serializable {
         this.materialVideoFirstImageUrl = materialVideoFirstImageUrl;
     }
 
-    public Integer getShareCount() {
+    public Long getShareCount() {
         return shareCount;
     }
 
-    public void setShareCount(Integer shareCount) {
+    public void setShareCount(Long shareCount) {
         this.shareCount = shareCount;
     }
 
-    public String getProducerId() {
+    public Long getProducerId() {
         return producerId;
     }
 
-    public void setProducerId(String producerId) {
+    public void setProducerId(Long producerId) {
         this.producerId = producerId;
     }