Merge remote-tracking branch 'origin/base-modify' into base-modify

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/UserCouponBiz.java

@@ -121,11 +121,11 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
         if(amout.compareTo(new BigDecimal("0.00"))>0&&list.size()>0){
             for (UserCouponVo couponVo:list){
                     Integer status=2;
-                    if(couponVo.getChannel()==1){
+                    if(couponVo.getType()==1){
                         if (amout.compareTo(couponVo.getWithAmount())>=0){
                             status=1;
                         }
-                    }else if (couponVo.getChannel()==3){
+                    }else if (couponVo.getType()==3){
                         status=1;
                     }
 

xx-app/xx-app-api/src/main/java/com/xxfc/platform/app/entity/vo/BannerVo.java

@@ -11,6 +11,7 @@ import lombok.Data;
 @Data
 public class BannerVo {
 
+    private  String title;
 
     /**
      * 封面地址

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/biz/BannerBiz.java

@@ -39,6 +39,7 @@ public class BannerBiz extends BaseBiz<BannerMapper,Banner> {
             BannerVo bannerVo = new BannerVo();
             bannerVo.setCover(banner.getCover());
             bannerVo.setUrl(banner.getUrl());
+            bannerVo.setTitle(banner.getTitle());
             bannerVos.add(bannerVo);
         });
         return bannerVos;