解决冲突

src/main/java/com/diagbot/facade/KlRuleFacade.java

@@ -10,9 +10,9 @@ import com.diagbot.dto.KlRuleByIdDTO;
 import com.diagbot.dto.KlRuleByIdParDTO;
 import com.diagbot.dto.KlRuleByIdSubDTO;
 import com.diagbot.dto.KlRuleInfoDTO;
+import com.diagbot.dto.OtherExportDTO;
 import com.diagbot.dto.RuleDTO;
 import com.diagbot.dto.RuleQueryDTO;
-import com.diagbot.dto.OtherExportDTO;
 import com.diagbot.entity.KlRule;
 import com.diagbot.entity.KlRuleBase;
 import com.diagbot.entity.KlRuleCondition;
@@ -327,10 +327,7 @@ public class KlRuleFacade extends KlRuleServiceImpl {
         if (type == null) {
             return false;
         }
-        if ((type >= 308 && type <= 329) || (type >= 301 && type <= 304)) {
-            return true;
-        }
-        return false;
+        return (type >= 308 && type <= 329) || (type >= 301 && type <= 304);
     }
 
     /**