Merge remote-tracking branch 'origin/MVP1.5.4' into MVP1.5.4

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeRetirementMapper.xml

@@ -223,7 +223,7 @@
 		SELECT a.EMP_NAME,
 			   a.EMP_IDCARD,
 			   b.EMP_SEX,
-			   b.EMP_AGE,
+		       (substring(now(),1,4)-substring(a.EMP_IDCARD,7,4))-(substring(a.EMP_IDCARD,11,4)-date_format(now(),'%m%d')>0) EMP_AGE,
 			   b.EMP_PHONE,
 			   CASE
 				   WHEN MAX(a.EMP_NATRUE)=3 THEN "3"