Merge remote-tracking branch 'origin/master'

jiangping

2024-11-07 3e84978d39cf6399e2335f9a5b10ca144ee9f606

 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();