Merge remote-tracking branch 'origin/master'

wente

2024-06-07 4bff52e938ae2c260fe54d32ef680908868bb27e

 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/controller/XhProductModelController.java

@@ -68,9 +68,7 @@

    @GetMapping("getProduct")
    public Result<List<ProductImg>> getProduct(Long productId) {

        List<ProductImg> list = xhProductModelService.getProduct(productId);

        return Result.ok(list);
    }