Merge branch 'master' of http://xearth.cn:6600/r/web-manage/web-manage-back

p-honggang.li

2025-08-28 f0da95925bcb8ad19b0d1cc78afe4b4a4ae188a6

 src/main/java/com/webmanage/controller/ProductPricingController.java

@@ -10,6 +10,7 @@
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

@@ -107,9 +108,9 @@
     */
    @GetMapping("/product/{productId}")
    @ApiOperation("根据产品ID查询定价列表")
    public Result<List<ProductPricing>> getPricingByProductId(@ApiParam("产品ID") @PathVariable Long productId) {
    public Result<List<ProductPricing>> getPricingByProductId(@ApiParam("产品ID") @PathVariable String productId) {
        try {
            if (productId == null) {
            if (!StringUtils.hasText(productId)) {
                return Result.error("产品ID不能为空");
            }
            List<ProductPricing> result = productPricingService.getPricingByProductId(productId);