Commit a05da8d1 authored by fangxinjiang's avatar fangxinjiang

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

parents 57888079 59d4c08d
......@@ -709,7 +709,7 @@
a.bank_name AS bankName,
a.account_ec_id AS accountEcId,
a.account_name AS accountName,
a.country AS country
a.account_country AS country
FROM t_gz_emp_info a
where a.del_flag = '0' and a.id = #{gzEmpId}
ORDER BY a.create_time desc limit 1
......@@ -806,8 +806,8 @@
date_format(a.contract_end_dt, '%Y-%m-%d') contractEndDt,
date_format(a.contract_exp_end_dt, '%Y-%m-%d') contrctExpEndDt,
a.probation probation,
date_format(a.prc_exp_dt, '%Y-%m-%d') probationDt,
date_format(a.probation_dt, '%Y-%m-%d') prcExpDt,
if(a.probation='0','1900-01-01',date_format(a.prc_exp_dt, '%Y-%m-%d')) probationDt,
if(a.probation='0','1900-01-01',date_format(a.probation_dt, '%Y-%m-%d')) prcExpDt,
a.nee_provider_id neeProviderId,
a.work_location workLocation,
'' fileId,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment