From ed2823ccf96675ab29414a588bba85bb8852ef9d Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期日, 28 四月 2024 11:52:25 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

---
 north-glass-erp/src/main/java/com/example/erp/entity/userInfo/User.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/entity/userInfo/User.java b/north-glass-erp/src/main/java/com/example/erp/entity/userInfo/User.java
index 4839e0d..2bcca8f 100644
--- a/north-glass-erp/src/main/java/com/example/erp/entity/userInfo/User.java
+++ b/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;

--
Gitblit v1.8.0