Merge remote-tracking branch 'origin/master'

src/main/java/com/ycwl/basic/model/mobile/DTO/WeChatUserInfoUpdateDTO.java

@@ -22,5 +22,5 @@ public class WeChatUserInfoUpdateDTO {
     /**
      * 是否同意用户协议，1同意0未同意
      */
-    private Long id;
+    private Integer agreement;
 }

src/main/java/com/ycwl/basic/model/mobile/goods/GoodsVO.java

@@ -32,6 +32,6 @@ public class GoodsVO {
     private Integer sourceType;
     @ApiModelProperty("商品id goodsType为1时才有值")
     private Long goodsId;
-    @ApiModelProperty("视频链接 goodsType为1时才有值")
-    private String videoUrl;
+    @ApiModelProperty("模版封面图片")
+    private String templateCoverUrl;
 }