Merge remote-tracking branch 'origin/master'

jiangping

2024-11-29 8eb708f2b6d792f03725a0ff437f51da5af45a45

 server/system_service/src/main/java/com/doumee/core/annotation/excel/ExcelImporter.java

@@ -295,7 +295,8 @@
                            }else{
                                val = String.valueOf(val.toString()).trim();
                            }
                        }else if (valType == Integer.class){
                        }
                        else if (valType == Integer.class){
                            val = Double.valueOf(val.toString()).intValue();
                        }else if (valType == Long.class){
                            val = Double.valueOf(val.toString()).longValue();