holiday更新

protected/controller/HolidayController.php

@@ -172,8 +172,10 @@ class HolidayController extends DooController {
 						}
 						$msg = substr($msg,0,strlen($msg)-1);
 					}
-				}else{
+				}elseif(in_array($v['type'],array(6,7,8,9))){
 					$msg .= $v['starttime']. ' 至 '.$v['endtime'];
+				}elseif(in_array($v['type'],array(13,14))){
+					$msg .= date('Y-m-d H:i:s',$v['addtime']);
 				}
 				$holidaymsg[$k]['daymsg'] = $msg;
 			}