From 51c36e6f6b17862714fbd5c42da43386dc05d28a Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 09 Apr 2021 14:32:29 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

---
 screen-common/src/main/java/com/moral/util/ConvertUtils.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/screen-common/src/main/java/com/moral/util/ConvertUtils.java b/screen-common/src/main/java/com/moral/util/ConvertUtils.java
index 5f60f4f..baf5196 100644
--- a/screen-common/src/main/java/com/moral/util/ConvertUtils.java
+++ b/screen-common/src/main/java/com/moral/util/ConvertUtils.java
@@ -1,6 +1,5 @@
 package com.moral.util;
 
-import org.mockito.internal.util.StringUtil;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

--
Gitblit v1.8.0