Merge remote-tracking branch 'origin/master'

wente

2024-06-07 4bff52e938ae2c260fe54d32ef680908868bb27e

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

@@ -63,7 +63,6 @@
    @GetMapping("tree")
    public Result<List<TyProductModel>> getTreeList() {
        List<TyProductModel> list = tyProductModelService.getAllTree();

        return Result.ok(list);
    }