Merge remote-tracking branch 'origin/master'

xuhy

2025-01-16 9fde9f917552f659d41fcfce5094f429a29b8ead

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -372,6 +372,10 @@
   public int resetUserPwd(String userName, String password) {
      return userMapper.resetUserPwd(userName, password);
   }
   @Override
   public int resetUserShopPwd(String userName, String password) {
      return userMapper.resetUserShopPwd(userName, password);
   }
   
   /**
    * 新增用户角色信息