Merge branch 'test6.9.21' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.21

@@ -3,15 +3,12 @@ package com.yohoufo.promotion.controller;
 import com.yoho.core.rest.annotation.ServiceDesc;
 import com.yohobuy.ufo.model.promotion.CouponSimpleBo;
 import com.yohobuy.ufo.model.promotion.request.CouponListReq;
-import com.yohobuy.ufo.model.promotion.response.CouponInfo;
-import com.yohobuy.ufo.model.promotion.response.CouponInfoListBo;
 import com.yohobuy.ufo.model.promotion.response.CouponListBo;
 import com.yohoufo.common.ApiResponse;
 import com.yohoufo.promotion.service.impl.CollectiveCouponService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;

 package com.yohoufo.promotion.controller;
 
+import com.yoho.core.rest.annotation.ServiceDesc;
 import com.yohobuy.ufo.model.promotion.CouponDisplayBo;
 import com.yohobuy.ufo.model.promotion.CouponSimpleBo;
 import com.yohobuy.ufo.model.promotion.response.CouponSendBo;
 import com.yohoufo.common.ApiResponse;
 import com.yohoufo.common.annotation.IgnoreSession;
+import com.yohoufo.common.annotation.IgnoreSignature;
+import com.yohoufo.common.annotation.InnerApi;
 import com.yohoufo.promotion.service.ICouponCacheService;
 import com.yohoufo.promotion.service.ICouponService;
 import com.yohoufo.promotion.service.impl.CouponDisplayService;
@@ -17,6 +20,7 @@ import java.util.List;
 
 @RestController
 @RequestMapping("/erp")
+@ServiceDesc("coupon")
 public class ErpGWCouponController {
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
@@ -90,6 +94,8 @@ public class ErpGWCouponController {
 
     @RequestMapping("/coupon/addOrUpdateDisplay")
     @IgnoreSession
+    @IgnoreSignature
+    @InnerApi
     public int addOrUpdateDisplay(@RequestBody CouponDisplayBo req){
         return couponDisplayService.addOrUpdate(req);
     }