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

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/dto/ExcelInfo.java

@@ -121,7 +121,7 @@ public class ExcelInfo {
             return "1";
         if(value.equals("SMALLINT"))
             return "2";
-        if(value.equals("MEDIUMINT")||value.equals("废弃"))
+        if(value.equals("MEDIUMINT"))
             return "3";
         if(value.equals("INT"))
             return "4";
@@ -133,7 +133,7 @@ public class ExcelInfo {
             return "7";
         if(value.equals("DECIMAL"))
             return "8";
-        if(value.equals("YEAR"))
+        if(value.equals("YEAR")||value.equals("废弃"))
             return "9";
         if(value.equals("TIME"))
             return "10";