Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

liyong

19 小时以前 dbd7fd484b5c7ed00cb895f227645848c3677c08

 src/main/java/com/ruoyi/projectManagement/vo/SavePlanNodeVo.java

@@ -4,8 +4,8 @@
import lombok.Data;
import lombok.NoArgsConstructor;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import java.io.Serializable;

/**
@@ -23,13 +23,13 @@

    private Integer sort;

    @NotBlank
    @NotBlank(message = "name不能为空")
    private String name;

    @NotNull
    @NotNull(message = "leaderId不能为空")
    private Long leaderId;

    @NotBlank
    @NotBlank(message = "leaderName不能为空")
    private String leaderName;

    private Integer estimatedDuration;