合并分支 'wyl' 到 'master'

src/main/java/com/zjty/inspect/utils/WorkLoadUtil.java

@@ -290,7 +290,8 @@ public class WorkLoadUtil {
                 (1.0+(browserDifficulty.getFlash()!=null&&browserDifficulty.getFlash()==1?1.0:0)/100)*
                 (1.0+(browserDifficulty.getOtherDemand()!=null&&browserDifficulty.getOtherDemand()==1?1.0:0)/100);
         List<CompatibleBrowser> compatibleBrowsers = reform.getBrowser().getCompatibleBrowsers();
-        if (compatibleBrowsers!=null&&compatibleBrowsers.contains(CompatibleBrowser.IETRIDENT)) {
+        //if (compatibleBrowsers!=null&&compatibleBrowsers.contains(CompatibleBrowser.IETRIDENT)) {
+        if (compatibleBrowsers==null||!compatibleBrowsers.contains(CompatibleBrowser.FIREFOX)) {
             eBrowser*=1.1;
             logger.info("浏览器难度包含IE");
         }