Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

廖井涛

2024-04-28 ed2823ccf96675ab29414a588bba85bb8852ef9d

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

@@ -3,6 +3,7 @@
import lombok.Data;
@Data //用于接受前端登录额user信息
public class UserDTO {
    private Integer id;
    private String userId;
    private String pass;
    private String token;