From 77ac99a1d0cad1f8d48f45a6f8e2d93d29c8f105 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 12 七月 2022 22:52:06 +0800
Subject: [PATCH] !198 Merge remote-tracking branch 'origin/dev' into dev Merge pull request !198 from 孤舟烟雨/auto-494979-dev-1657633741164

---
 ruoyi-ui/src/utils/index.js |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ruoyi-ui/src/utils/index.js b/ruoyi-ui/src/utils/index.js
index ad317bd..df5db12 100644
--- a/ruoyi-ui/src/utils/index.js
+++ b/ruoyi-ui/src/utils/index.js
@@ -1,3 +1,5 @@
+import { parseTime } from './ruoyi'
+
 /**
  * 琛ㄦ牸鏃堕棿鏍煎紡鍖�
  */
@@ -379,9 +381,10 @@
 
 // 涓嬪垝杞┘宄�
 export function camelCase(str) {
-  return str.replace(/-[a-z]/g, str1 => str1.substr(-1).toUpperCase())
+  return str.replace(/_[a-z]/g, str1 => str1.substr(-1).toUpperCase())
 }
 
 export function isNumberStr(str) {
   return /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g.test(str)
 }
+

--
Gitblit v1.9.3