Merge branch 'feature/maolipeng/20210629/piliang' into dev

# Conflicts:
#	src/modules/teach-tool/paper-manage/OperatePaper.jsx

src/modules/teach-tool/paper-manage/OperatePaper.jsx

@@ -919,11 +919,16 @@ class OperatePaper extends Component {
                   <div className='paper-info-tip' style={{ margin: '0 auto 12px' }}>
                     总计<span>{totalScore}</span>分，共
                     <span>{questionCnt}</span>
-                    题。 {singleChoiceCnt > 0 && `单选题${singleChoiceCnt}题，共${singleChoiceScore}分；`}
-                    {multiChoiceCnt > 0 && `多选题${multiChoiceCnt}题，共${multiChoiceScore}分；`}
-                    {judgeCnt > 0 && `判断题${judgeCnt}题，共${judgeScore}分，`}
-                    {gapFillingCnt > 0 && `填空题${gapFillingCnt}题，共${gapFillingScore}分，`}
-                    {indefiniteChoiceCnt > 0 && `不定项选择题${indefiniteChoiceCnt}题，共${indefiniteChoiceScore}分`}
+                    题。{" "}
+                    {singleChoiceCnt > 0 &&
+                      `单选题${singleChoiceCnt}题，共${singleChoiceScore}分；`}
+                    {multiChoiceCnt > 0 &&
+                      `多选题${multiChoiceCnt}题，共${multiChoiceScore}分；`}
+                    {judgeCnt > 0 && `判断题${judgeCnt}题，共${judgeScore}分；`}
+                    {gapFillingCnt > 0 &&
+                      `填空题${gapFillingCnt}题，共${gapFillingScore}分；`}
+                    {indefiniteChoiceCnt > 0 &&
+                      `不定项选择题${indefiniteChoiceCnt}题，共${indefiniteChoiceScore}分；`}
                   </div>
                 )}
                 <XMTable