|
|
@@ -825,7 +825,7 @@
|
|
|
date_format(a.promotion_time,'%Y-%m-%d')promotionTimes,date_format(a.birthday,'%Y-%m-%d')birthdays,
|
|
|
a.entry_time entryTime, a.sex,a.son,a.girl,a.political_outlook politicalOutlook,d.education,
|
|
|
d.school,d.major,d.title,pm.promotion_remarks promotionRemarks,a.mobile,a.fixed_tel fixedTel,
|
|
|
- date_format(pm.promotion_time,'%Y-%m-%d') promotionTime,a.id_card idCard,a.birthday,
|
|
|
+ date_format(pm.promotion_time,'%Y-%m-%d') promotionTime,a.id_card idCard,a.birthday,a.employee_id employeeId,
|
|
|
date_format(pm.contract_start_time, '%Y-%m-%d') contractStart,date_format(pm.contract_end_time,'%Y-%m-%d')contractEnd,
|
|
|
a.certification_authority certificationAuthority, a.residence_province residenceProvince,
|
|
|
a.residence_city residenceCity,a.residence_area residenceArea, a.residence_address residenceAddress,
|