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

peng

4 天以前 1fdfb56613adca09a0ddf39289b41f96fa335a01

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

@@ -8,6 +8,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@@ -35,4 +36,10 @@
        return memberCustomerTagService.detail();
    }

    @GetMapping("/detail/{id}")
    @ApiOperation(value = "通过id获取会员标签详情", notes = "通过id获取会员标签详情")
    public Result detailById(@PathVariable String id){
        return memberCustomerTagService.detailById(id);
    }

}