Merge remote-tracking branch 'origin/master'

rk

2 天以前 4a7c8d6ac4d2c38ac0c0145a54ab07b7ad5615f3

 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{