Merge branch 'pre' into dev

zhongzheng-common/pom.xml

@@ -125,13 +125,7 @@
             <artifactId>poi-ooxml-schemas</artifactId>
             <version>4.1.0</version>
         </dependency>
-
-        <dependency>
-            <groupId>e-iceblue</groupId>
-            <artifactId>spire.doc.free</artifactId>
-            <version>3.9.0</version>
-        </dependency>
-
+    
 
             <!-- yml解析器 -->
         <dependency>

zhongzheng-system/src/main/java/com/zhongzheng/modules/bank/service/impl/QuestionServiceImpl.java

@@ -362,13 +362,13 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                 buffer = wordExtractor.getText();
                 wordExtractor.close();*/
             } else if (path.endsWith("docx")) {
-                String htmlContent = "";
+               String htmlContent = "";
                 InputStream in = file.getInputStream();
 
-               /* Document docF = new Document();
+                Document docF = new Document();
                 docF.loadFromStream(in,FileFormat.Docx);
                 docF.saveToFile("D:/wordtohtml.html", FileFormat.Html);
-                docF.dispose();*/
+                docF.dispose();
 
 
                 InputStream is = file.getInputStream();

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserExamWrongRecordServiceImpl.java

@@ -152,7 +152,7 @@ public class UserExamWrongRecordServiceImpl extends ServiceImpl<UserExamWrongRec
     public Boolean remove_question(UserExamWrongRecordQueryBo bo) {
         return this.remove(new LambdaQueryWrapper<UserExamWrongRecord>()
                 .eq(UserExamWrongRecord::getQuestionId,bo.getQuestionId())
-                .eq(UserExamWrongRecord::getGoodsId,bo.getGoodsId())
+                .eq(UserExamWrongRecord::getOrderGoodsId,bo.getOrderGoodsId())
                 .eq(UserExamWrongRecord::getExamId,bo.getExamId())
                 .eq(UserExamWrongRecord::getUserId,bo.getUserId()));
     }