Merge remote-tracking branch 'origin/master'

src/main/java/com/yxt/yythmall/biz/appletbanner/AppletBanner.java

@@ -38,4 +38,5 @@ public class AppletBanner extends EntityWithId {
 
     private String bannerUrl;//轮播图完整URL
     private String bannerPath;//轮播图相对地址
+    private String contentUrl;//内容图片
 }

src/main/java/com/yxt/yythmall/wxapi/vo/WxBannerListVo.java

@@ -10,4 +10,5 @@ public class WxBannerListVo {
 
     private String bannerUrl;//轮播图完整URL
     private String bannerPath;//轮播图相对地址
+    private String contentUrl;//轮播图相对地址
 }