Merge remote-tracking branch 'origin/feature/1.0.0' into feature/1.0.0

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/res/LoginRes.java

@@ -21,6 +21,9 @@ public class LoginRes implements Serializable {
   @ApiModelProperty("id")
   private Long id;
 
+  @ApiModelProperty(value = "用户名")
+  private String userName;
+
   @ApiModelProperty("角色code")
   private String roleCode;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/LoginServiceImpl.java

@@ -92,6 +92,7 @@ public class LoginServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> impl
         //返回传参
         LoginRes build = LoginRes.builder()
                 .token(MessageFormat.format("Bearer {0}",token))
+                .userName(userInfo.getUserName())
                 .id(userInfo.getId())
                 .roleCode(userInfo.getRoleCode())
                 .factoryId(userInfo.getFactoryId())