Merge remote-tracking branch 'origin/master'

rk

昨天 511ce651667f5b2284247cc60599078b86f7963f

 server/dmmall_web/src/main/java/com/doumee/api/web/CouponApi.java

@@ -16,12 +16,9 @@
import org.springframework.web.bind.annotation.RestController;

@Api(tags = "优惠券业务")
@RestController
//@RestController
@RequestMapping("/web/coupon")
public class CouponApi extends ApiController{