Merge branch 'online1' of http://git.dayaedu.com/yonge/mec

mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -3078,7 +3078,7 @@ public class ExportController extends BaseController {
             String[] body = {"id", "realName", "mobileNo", "wechatNo", "subjectName", "liveCity", "intentionCity",
                     "sourceFrom", "nextVisitDateStr", "entryDateStr", "position.msg","organName","status.desc",
                     "idCard", "age", "gender?'男':'女'", "bankCardNo","bankAddress","emergencyContactName",
-                    "emergencyContactRelation", "emergencyContactPhone", "updateTime", "operatorName","resignationDateStr"};
+                    "emergencyContactRelation", "emergencyContactPhone", "updateTime", "hrbpName","resignationDateStr"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, rows);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=employeeInfo-" + DateUtil.getDate(new Date()) + ".xls");