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

廖井涛

2024-04-28 ed2823ccf96675ab29414a588bba85bb8852ef9d

 north-glass-erp/src/main/java/com/example/erp/entity/userInfo/User.java

@@ -10,7 +10,7 @@
    @TableId(type = IdType.AUTO)
    private  Integer id;
    private  String loginName;
    private  String passWord;
    private  String password;
    private  String userName;
    private  String address;
    private  String phone;