Merge remote-tracking branch 'origin/qa' into qa

cjl

2023-10-10 495fad8166b5952c013aea275243cb9ee6e7fa2a

 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;