Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyujie

2025-08-11 e51e45f2cabcc4628ce93e55c7c3806b1b760161

 north-glass-erp/src/main/java/com/example/erp/controller/dto/UserDTO.java

@@ -1,10 +1,17 @@
package com.example.erp.controller.dto;

import lombok.Data;

import java.util.List;

@Data //用于接受前端登录额user信息
public class UserDTO {
    private Integer id;
    private String userId;
    private String pass;
    private String token;
    private String userName;
    private  String address;
    private  String phone;
    private List<String> permissions;
}