Merge remote-tracking branch 'origin/master'

doum

10 小时以前 e68e324f91d1a4eb2d4c5f07d27ca105a308bc0c

 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{