Merge remote-tracking branch 'origin/master'

one_stop_public/libs/Split/TableSelectZhanWei.js

@@ -93,7 +93,9 @@ export default function TableSelectZhanWei(props) {
         Object.keys(typeList).map((g) => {
           const typeOne = typeList[g];
           return <span key={g} className={styles.tipsSpan}>
-            <span className={styles.tipsBlock} style={typeOne.styleTips}></span>
+            <span className={styles.tipsBlock} style={typeOne.styleTips}>
+
+            </span>
             <span className={styles.tipsText}>{typeOne.text}</span>
           </span>;
         })

one_stop_public/libs/Split/styles.less

@@ -46,6 +46,7 @@
     column-gap: 15px;
     row-gap: 15px;
     height: 80%;
+    padding-bottom: 20px;
     //max-height: 50vh;
     //min-height: 30vh;
     overflow-y: auto;