Merge branch 'develop' of develop-gitlab.youlingrc.com:8timerv2/8timerapiv200 into develop

src/main/resources/mapping/xcgl/XcglAssoGztztMapper.xml

@@ -73,7 +73,7 @@
 						bmgw.dept,
 			 			bmgw.post
 					from xcgl_asso_gztzt gztzt
-		LEFT JOIN yggl_main_emp as emp on emp.emp_num = gztzt.userid and emp.org_code = #{orgcode}
+		LEFT JOIN yggl_main_emp as emp on emp.id = gztzt.userid and emp.org_code = #{orgcode}
 		LEFT JOIN (select m.name as post,um.name as dept,m.id as mid
 						 from zzgl_bmgw_m m 
 						 left join zzgl_bmgw_m um on um.id = m.up_id