Merge branch 'master' into development_mqr

src/views/actualCombat/index.vue

@@ -552,6 +552,7 @@ let params = {
     font-size: 0.4rem;
     display:block;
     height: 100%;
+    padding: 0.2rem;
 }
 .clickBtn{
        width: 2rem;