Merge remote-tracking branch 'origin/master'

xyc

2024-05-09 a9bf1966f94955f542d39147fb1539befe2b4eec

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

@@ -103,7 +103,7 @@
        //效验数据
        ValidatorUtils.validateEntity(xhProductModel, AddGroup.class, DefaultGroup.class);

        Integer no = xhProductModelService.getNo(xhProductModel.getPid());
        Integer no = xhProductModelService.getNo(xhProductModel.getPid(),xhProductModel.getProductType());
        if (xhProductModel.getSort() < no) {
            xhProductModel.setSort(no + 1);
        }