Merge remote-tracking branch 'origin/push-dev' into push-test

rule/src/main/java/org/diagbot/rule/crisis/CrisisApplication.java

@@ -22,6 +22,7 @@ public class CrisisApplication {
     private String key = "crisis";
 
     public Map<String, List<CrisisDetail>> crisisContent(SearchData searchData) {
+        searchData.setRuleType("1,2");
         Map<String, List<Rule>> rules = searchData.getRules();
         List<String> ruleTypeIdList = new ArrayList<>();
         if (rules == null) {