Merge remote-tracking branch 'origin/master'

xyc

2024-08-02 7abc95a191d2c1a9bb9ff8fd7fb05470a0d4e86b

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

@@ -63,8 +63,8 @@
    }

    @GetMapping("tree")
    public Result<List<XhProductModel>> getTreeList(Boolean showXdy, Integer ztShow) {
        List<XhProductModel> list = xhProductModelService.getAllTree(showXdy, ztShow);
    public Result<List<XhProductModel>> getTreeList(Boolean showXdy, Integer ztShow,Long productId) {
        List<XhProductModel> list = xhProductModelService.getAllTree(showXdy, ztShow,productId);

        return Result.ok(list);
    }