Merge remote-tracking branch 'origin/sit' into sit

# Conflicts:
#	alien-entity/src/main/java/shop/alien/entity/store/vo/StoreInfoVo.java

alien-entity/src/main/java/shop/alien/entity/store/StoreInfo.java

@@ -235,7 +235,7 @@ public class StoreInfo {
     @TableField("update_renew_contract_time")
     private Date  updateRenewContractTime;
 
-    @ApiModelProperty(value = "分类id(词典表 键为 business_classify)")
+    @ApiModelProperty(value = "分类id(词典表 键为 business_classify)(多个ID用逗号拼接)")
     @TableField("business_classify")
     private String businessClassify;
 

alien-store/src/main/java/shop/alien/store/controller/StoreInfoController.java

@@ -398,9 +398,17 @@ public class StoreInfoController {
     @GetMapping("/getStoreCouponList")
     @ResponseBody
     public R getStoreCouponList(@RequestParam("storeId") String storeId) {
-        log.info("StoreInfoController.getStoreDetail?storeId={},userId={}", storeId);
+        log.info("StoreInfoController.getStoreCouponList?storeId={}", storeId);
+        CouponAndEventVo couponAndEventVo = new CouponAndEventVo();
         List<LifeCouponVo> lifeCouponVos = storeInfoService.getStoreCouponList(storeId);
-        return R.data(lifeCouponVos);
+
+        List<StoreImg> storeImgs = storeInfoService.getBannerUrl(storeId);
+        couponAndEventVo.setCouponList(lifeCouponVos);
+        if (CollectionUtils.isNotEmpty(storeImgs)) {
+            couponAndEventVo.setMarketingList(storeImgs);
+        }
+        couponAndEventVo.setMarketingList(storeImgs);
+        return R.data(couponAndEventVo);
     }
 
     @ApiOperation(value = "web端审批店铺")