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

huang

2024-12-27 3c1f9d699497dcfc4b682502945a4ebee4c37e03

 north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/UserMapper.java

@@ -36,4 +36,6 @@
    Boolean updatePassWordById(Integer id,String passWord);

    Boolean updateUserNameById(Integer id,String userName);

    Boolean updateProcessMp(Integer id, String process);
}