解决冲突

jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/dto/getRateByEntryDate.java

@@ -0,0 +1,22 @@
+package org.jeecg.modules.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@ApiModel(value = "根据专业获取每个年级最新批次的通过率")
+@Data
+public class getRateByEntryDate {
+//    @ApiModelProperty(value = "年级")
+//    @NotBlank
+//    String entrydate;
+
+    @ApiModelProperty(value = "学院")
+    @NotBlank
+    private String college;
+
+    @ApiModelProperty(value = "专业")
+    private String major;
+}

jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/dto/getRateByMajorAndLastestBatchDto.java

@@ -0,0 +1,25 @@
+package org.jeecg.modules.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ *
+ * @author NanYu
+ * @date 2024/10/13
+ */
+@ApiModel(value = "根据专业获取每个年级最新批次的通过率")
+@Data
+public class getRateByMajorAndLastestBatchDto implements Serializable {
+    @ApiModelProperty(value = "学院")
+    @NotBlank
+    private String college;
+
+    @ApiModelProperty(value = "专业")
+    private String major;
+}