merge

boot-service/src/main/java/com/xwbing/service/sys/SysUserService.java

@@ -313,7 +313,7 @@ public class SysUserService {
         List<SysRole> sysRoles = sysRoleService.listByUserIdEnable(userId, enable);
         if (CollectionUtils.isEmpty(sysRoles))
             return list;
-        //遍获取每个角色拥有的权限，并去重
+        //遍历获取每个角色拥有的权限，并去重
         List<SysAuthority> temp;
         for (SysRole sysRole : sysRoles) {
             temp = sysAuthorityService.listByRoleIdEnable(sysRole.getId(), enable);

boot-service/src/main/java/com/xwbing/util/captcha/CaptchaException.java

@@ -1,4 +1,4 @@
-package com.xwbing.util.captcah;
+package com.xwbing.util.captcha;
 
 /**
  * 说明:创建验证码异常类

boot-service/src/main/java/com/xwbing/util/captcha/CaptchaServlet.java

@@ -1,4 +1,4 @@
-package com.xwbing.util.captcah;
+package com.xwbing.util.captcha;
 
 import com.xwbing.constant.CommonConstant;
 import com.xwbing.util.CommonDataUtil;

boot-service/src/main/java/com/xwbing/util/captcha/CaptchaUtil.java

@@ -1,4 +1,4 @@
-package com.xwbing.util.captcah;
+package com.xwbing.util.captcha;
 
 import javax.imageio.ImageIO;
 import java.awt.*;