diff --git a/ruoyi-admin/src/main/resources/templates/manage/order/edit.html b/ruoyi-admin/src/main/resources/templates/manage/order/edit.html
index 4a2cd06d..9d2cc1b5 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/order/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/order/edit.html
@@ -37,7 +37,7 @@
             <div class="form-group">
                 <label class="col-sm-4 control-label is-required">版本号：</label>
                 <div class="col-sm-8">
-                    <input name="versionCode" th:field="*{versionCode}" class="form-control" type="text" max="100" min="0" required>
+                    <input name="versionCode" th:field="*{versionCode}" class="form-control" type="number" max="100" min="0" required>
                 </div>
             </div>
         </div>
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
index ee276d92..04ee243a 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
@@ -426,6 +426,9 @@ public class ExcelUtil<T>
                     if (String.class == fieldType)
                     {
                         String s = Convert.toStr(val);
+                        if (StringUtils.isNotEmpty(s)) {
+                            s = s.trim();
+                        }
                         if (StringUtils.endsWith(s, ".0"))
                         {
                             val = StringUtils.substringBefore(s, ".0");
@@ -439,7 +442,7 @@ public class ExcelUtil<T>
                             }
                             else
                             {
-                                val = Convert.toStr(val);
+                                val = s;
                             }
                         }
                     }