Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/managementcenter/project/web/ProjectController.java

@@ -111,7 +111,7 @@ public class ProjectController extends BaseController {
 	@RequestMapping(value = "data")
 	public Map<String, Object> data(Project project, HttpServletRequest request, HttpServletResponse response, Model model) {
 		//获取登录名
-		String loginName = UserUtils.getUser().getLoginName();//获取登录名
+		String loginName = UserUtils.getUser().getName();//获取登录名
 		if (!"admin".equals(loginName)){
 			project.setLoginNameFindStats("1");
 			project.setLoginNameFind(loginName);