Merge branch 'refs/heads/master' into sso

zhsq_qk-system/src/main/resources/mapper/system/QkZwyxHighFrequencyMattersMapper.xml

@@ -81,6 +81,6 @@
     <select id="visualizationList" parameterType="Long"
             resultMap="QkZwyxHighFrequencyMattersResult">
         <include refid="selectQkZwyxHighFrequencyMattersVo"/>
-        ORDER BY event_count ASC;
+        ORDER BY CAST(event_count AS SIGNED) DESC;
     </select>
 </mapper>

zhsq_qk-ui/src/assets/images/qkq_sprh.css

@@ -1338,6 +1338,7 @@ padding-right: 10px;
 	text-align: right!important;
 }
 .qkq_bjs_con{
+  margin-bottom: -52px;
 	display: flex;
 	flex-direction: row;
 	justify-content: space-between;