Merge branch 'feature-content3' into developer

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

@@ -25,6 +25,11 @@ public class ContentMaterialShareInfoVO implements Serializable {
     private String goodsShortLink;
 
     /**
+     * 短链错误信息
+     */
+    private String linkErrMsg;
+
+    /**
      * 商品二维码
      */
     private String goodsQrcode;

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

@@ -61,5 +61,10 @@ public class SimpleGoodsInfoVO implements Serializable {
      */
     private Integer status;
 
+    /**
+     * 商品佣金
+     */
+    private BigDecimal commission;
+
 }