Merge remote-tracking branch 'origin/master'

rk

昨天 511ce651667f5b2284247cc60599078b86f7963f

 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{