Merge remote-tracking branch 'origin/dev' into dev

xuhy

2024-02-01 8dd61e711d7cccd7d8d1278ab79a73e7a41aad4d

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TUserController.java

@@ -423,7 +423,7 @@
                    }else if ("否".equals(isAuth)){
                        user.setIsAuth(1);
                    }
                    user.setName(name);
                    user.setFirstName(name);
                    user.setIdCard(idCard);
                    user.setBalance(new BigDecimal(balance));
                    user.setPassWord(ShiroKit.md5(passWord, "&a.s"));