Merge branch 'master' of http://git.izouma.com/licailing/wenlvju

src/main/java/com/izouma/wenlvju/service/RateService.java

@@ -548,7 +548,7 @@ public class RateService {
         fis.close();
 
         //删除文件
-        FileUtils.delFiles(file);
+//        FileUtils.delFiles(file);
         return buffer;
 
 //        OutputStream toClient = new BufferedOutputStream(response.getOutputStream());

src/main/java/com/izouma/wenlvju/service/UserService.java

@@ -380,7 +380,7 @@ public class UserService {
     }
 
     public void forgetPassword(String name, String phone, String password) {
-        User user = userRepo.findByPhoneAndDelFalse(phone);
+        User user = userRepo.findByPhoneAndDelFalse(phone.trim());
         if (ObjectUtil.isNull(user)) {
             throw new BusinessException("此手机号并未注册！");
         }