Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms

xiaoyong931011

2022-07-05 e703d415ff36584518a76d4d26363bfd1556b43b

 src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CommonServiceImpl.java

@@ -69,10 +69,10 @@
            if (valueOperations.get(codeToken).equals(codeValue)) {
                redisTemplate.delete(codeToken);
            } else {
                return Result.fail("请输入正确验证码");
                return Result.fail("验证码不正确");
            }
        } else {
            return Result.fail("验证码已过期，请刷新当前页面");
            return Result.fail("验证码已过期");
        }
        String username = adminLoginDto.getUsername();
        String password = adminLoginDto.getPassword();