From b0bf4f9e80e976f3077b6ebdb893ac14ae5d010c Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Tue, 12 Mar 2024 09:31:10 +0800
Subject: [PATCH] updates

---
 .../yx/controller/YxSchoolController.java     | 20 +++++++++----------
 .../org/jeecg/modules/yx/entity/YxSchool.java | 12 -----------
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolController.java
index b8f327d..6bc6849 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolController.java
@@ -1929,16 +1929,16 @@ public class YxSchoolController extends JeecgController<YxSchool, IYxSchoolServi
                 oldSchool.setGzd(school.getSfgzd());//是否国重点
                 oldSchool.setSjyl(school.getSjyl());//世界一流
                 oldSchool.setSfsyl(school.getSfsyl());//是否双一流
-                if (StringUtils.isNotBlank(school.getSsd())) {
-                    oldSchool.setMasterPoint(Integer.valueOf(school.getSsd()));//硕士点
-                }else{
-                    oldSchool.setMasterPoint(0);
-                }
-                if (StringUtils.isNotBlank(school.getBsd())) {
-                    oldSchool.setDoctoralPoint(Integer.valueOf(school.getBsd()));//博士点
-                }else{
-                    oldSchool.setDoctoralPoint(0);
-                }
+//                if (StringUtils.isNotBlank(school.getSsd())) {
+//                    oldSchool.setMasterPoint(Integer.valueOf(school.getSsd()));//硕士点
+//                }else{
+//                    oldSchool.setMasterPoint(0);
+//                }
+//                if (StringUtils.isNotBlank(school.getBsd())) {
+//                    oldSchool.setDoctoralPoint(Integer.valueOf(school.getBsd()));//博士点
+//                }else{
+//                    oldSchool.setDoctoralPoint(0);
+//                }
 
                 //成立时间
                 if (StringUtils.isNotBlank(school.getClsj()) && !school.getClsj().equals("-") && !school.getClsj().equals("0")) {
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchool.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchool.java
index fb13e0d..d2032e1 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchool.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchool.java
@@ -143,18 +143,6 @@ public class YxSchool implements Serializable {
     @Excel(name = "院校类型", width = 15)
     @ApiModelProperty(value = "院校类型")
     private java.lang.String institutionType;
-    /**
-     * 博士点
-     */
-    @Excel(name = "博士点", width = 15)
-    @ApiModelProperty(value = "博士点")
-    private java.lang.Integer doctoralPoint;
-    /**
-     * 硕士点
-     */
-    @Excel(name = "硕士点", width = 15)
-    @ApiModelProperty(value = "硕士点")
-    private java.lang.Integer masterPoint;
     /**
      * 学生人数
      */