Merge branch 'feature-content777' into 'master'

Feature content777

See merge request !2068

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

@@ -68,6 +68,11 @@ public class ContentMaterialInfoVO implements Serializable {
     private Integer downloadFlag;
 
     /**
+     * 分享素材链接是否开启 1是0否
+     */
+    private Integer shareLinkFlag;
+
+    /**
      * 发布时间
      */
     private Date publishTime;
@@ -264,6 +269,14 @@ public class ContentMaterialInfoVO implements Serializable {
         this.downloadFlag = downloadFlag;
     }
 
+    public Integer getShareLinkFlag() {
+        return shareLinkFlag;
+    }
+
+    public void setShareLinkFlag(Integer shareLinkFlag) {
+        this.shareLinkFlag = shareLinkFlag;
+    }
+
     public Date getPublishTime() {
         return publishTime;
     }

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

@@ -70,6 +70,11 @@ public class ContentSettingVO implements Serializable {
      */
     private String weimoPicRatio;
 
+    /**
+     * 好办展示样式 版本1 版本2 ...
+     */
+    private Integer showStyle;
+
     public Long getContentSettingId() {
         return contentSettingId;
     }
@@ -157,4 +162,12 @@ public class ContentSettingVO implements Serializable {
     public void setWeimoPicRatio(String weimoPicRatio) {
         this.weimoPicRatio = weimoPicRatio;
     }
+
+    public Integer getShowStyle() {
+        return showStyle;
+    }
+
+    public void setShowStyle(Integer showStyle) {
+        this.showStyle = showStyle;
+    }
 }