发布v2.5.6版本

2023-04-26 15:46:53 +08:00
parent 33ce4c6298
commit 8145b2df84
55 changed files with 1193 additions and 223 deletions
--- a/webmain/main/userinfo/userinfoAction.php
+++ b/webmain/main/userinfo/userinfoAction.php
@@ -91,6 +91,9 @@ class userinfoClassAction extends Action
 		);
 		
 		$atatea = explode(',', '试用期,正式,实习生,兼职,临时工,离职');
+		$atrows = $this->option->getmnum('userstate');
+		foreach($atrows as $k1=>$rs1)if(!isempt($rs1['value']))$atatea[$rs1['value']] = $rs1['name'];
+		
 		foreach($rows as $k=>$rs){
 			$year = '';
 			if(!$this->isempt($rs['workdate'])) $year = substr($rs['workdate'],0,4);