提交代码，解决冲突

cqb-comm-utils/src/main/java/com/qmth/cqb/utils/CommonUtils.java

@@ -159,6 +159,11 @@ public final class CommonUtils {
         return list;
     }
 
+    public static String getOptionNum(int number){
+        char optionNum = (char)(65 + number);
+        return String.valueOf(optionNum);
+    }
+
     public static void main(String[] args) {
         // QuesStructType quesStructType = getEnum(QuesStructType.class,"单选");
         // System.out.println(quesStructType.getName());

cqb-comm-utils/src/main/java/com/qmth/cqb/utils/word/DocxProcessUtil.java

@@ -401,6 +401,9 @@ public final class DocxProcessUtil {
      * @return
      */
     public static String getTextInHtml(String htmlStr){
+        if(!htmlStr.startsWith("<p>")){
+            return htmlStr;
+        }
         try {
             org.jsoup.nodes.Document doc = Jsoup.parse(htmlStr);
             String textStr = "";