Commit 458f21ab authored by hongguangwu's avatar hongguangwu

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

parents b14d0476 681acf3e
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
b.EMP_PHONE phone, b.EMP_PHONE phone,
a.CREATE_TIME inTime, a.CREATE_TIME inTime,
if(a.IS_COMPLETE = '0','是','否') isComplete, if(a.IS_COMPLETE = '0','是','否') isComplete,
a.EMP_ID empInfoId, a.EMP_ID empInfoId
from from
t_employee_project a t_employee_project a
left join t_employee_info b on a.EMP_ID = b.id left join t_employee_info b on a.EMP_ID = b.id
......
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