Merge branch 'master' into 'develop'

Master

See merge request dcuc-tjdsj/auth-back!97

src/main/java/com/dragoninfo/dcuc/authweb/interceptor/SecurityAccessTokenResolver.java

@@ -96,7 +96,7 @@ public class SecurityAccessTokenResolver implements ISecurityAccessTokenResolver
         SecurityUser securityUser = new SecurityUser();
         securityUser.setId(userInfo.getId());
         securityUser.setName(userInfo.getName());
-        securityUser.setUserName(userInfo.getName());
+        securityUser.setUserName(userInfo.getIdcard());
         securityUser.setPoliceNo(userInfo.getPoliceNumber());
         securityUser.setIdcard(userInfo.getIdcard());
         securityUser.setSecurityOrg(userInfo.getOrgCode());