Merge remote-tracking branch 'origin/send_coupon' into send_coupon

peng

6 天以前 904812187f2fb4eafc9071458f3a91d3f7b7748a

 manager-api/src/main/java/cn/lili/controller/lmk/CustomerBlackController.java

@@ -14,7 +14,7 @@
import java.util.List;
import org.springframework.validation.annotation.Validated;
import javax.validation.constraints.NotEmpty;
import io.swagger.annotations.Api;;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.*;

/**