Merge remote-tracking branch 'origin/dev/ruleSearch20220222' into dev/ruleSearch20220222

src/main/resources/mapper/KlRuleMapper.xml

@@ -766,10 +766,8 @@
             AND t11. STATUS = 1) t13 ON t12.ruleId = t13.ruleId
         </if>
         ORDER BY
-        t12.conceptId,
-        t12.ruleType,
-        t12.hasSubCond,
         t12.gmtModified DESC,
-        t12.ruleId DESC
+        t12.ruleId DESC,
+        t12.conceptId DESC
     </select>
 </mapper>