Merge remote-tracking branch 'origin/dev' into dev_

jinpengyong

2021-06-24 06b00a178d194d33370e44410c4f04a4164f86c7

 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;