Merge remote-tracking branch 'origin/master'

doum

昨天 2da6cac0a9bab5ce7ad04ac17f73d456732f907e

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

@@ -25,7 +25,7 @@
 */
@Api(tags = "活动业务")
@Trace(exclude = true)
@RestController
//@RestController
@RequestMapping("/web/activity")
@Slf4j
public class ActivityApi extends ApiController{