Merge branch 'release' into 'master'

Release

See merge request !412

src/main/java/com/zhiwei/brandkbs2/service/impl/UserServiceImpl.java

@@ -164,6 +164,10 @@ public class UserServiceImpl implements UserService {
             }
         }
         User user = userDao.findOneById(userDTO.getId());
+        // 通过手机号再查询一次
+        if (null == user) {
+            user = userDao.findOne("phoneNumber", userDTO.getPhoneNumber());
+        }
         // 新用户
         if (null == user) {
             User newUser;