Merge branch 'master' of http://git.yvanui.com/hust/wuhan_epi

whepi-web/src/main/java/com/bofeng/entity/ExcelRiBaoLY.java

@@ -320,7 +320,7 @@ public class ExcelRiBaoLY {
         } else if (todayLocal == 4) {
             todayLoalDesc = todayLocalOther;
         }
-        return workLoalDesc;
+        return todayLoalDesc;
     }
 
     @ExcelProperty(value = "是否出行", index = 17)

whepi-web/src/main/java/com/bofeng/entity/ExcelRiBaoLYBM4.java

@@ -311,7 +311,7 @@ public class ExcelRiBaoLYBM4 {
         } else if (todayLocal == 4) {
             todayLoalDesc = todayLocalOther;
         }
-        return workLoalDesc;
+        return todayLoalDesc;
     }
 
     @ExcelProperty(value = "是否出行", index = 7)