Merge branch 'sit' of http://8.152.195.41:3000/alien/alien_cloud into sit

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

@@ -483,6 +483,9 @@ public class StoreInfoController {
     @ResponseBody
     public R getStoreCouponList(@RequestParam("storeId") String storeId) {
         log.info("StoreInfoController.getStoreCouponList?storeId={}", storeId);
+        if(storeId == null){
+            return R.fail("storeId错误,不能为null,请联系管理员检查");
+        }
         CouponAndEventVo couponAndEventVo = new CouponAndEventVo();
 //        List<LifeCouponVo> lifeCouponVos = storeInfoService.getStoreCouponList(storeId);