Merge remote-tracking branch 'origin/master'

rk

昨天 086be7eae50e48ad554fd8a3f4cb1e333d587595

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

@@ -17,7 +17,7 @@

@Api(tags = "店铺关注业务")
@Trace(exclude = true)
@RestController
//@RestController
@RequestMapping("/web/shopFollow")
@Slf4j
public class ShopFollowApi extends ApiController{