Merge remote-tracking branch 'origin/master'

xyc

2024-05-17 4a476243e0928236472f0a916467630cb5706ee5

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

@@ -89,7 +89,7 @@
    public Result insert(@RequestBody TyProductModel tyProductModel){
        //效验数据
        ValidatorUtils.validateEntity(tyProductModel, AddGroup.class, DefaultGroup.class);
        Integer no = tyProductModelService.getNo(tyProductModel.getPid());
        Integer no = tyProductModelService.getNo(tyProductModel.getPid(),tyProductModel.getNodeType());
        tyProductModel.setSort(no + 1);
        tyProductModelService.insert(tyProductModel);