Merge branch 'master' into java-datetime-format

This commit is contained in:
xhh
2015-11-12 17:10:08 +08:00
64 changed files with 3814 additions and 145 deletions

View File

@@ -73,7 +73,7 @@ public class UserApiTest {
private User createUser() {
User user = new User();
user.setId(System.currentTimeMillis());
user.setUsername("fred");
user.setUsername("fred" + user.getId());
user.setFirstName("Fred");
user.setLastName("Meyer");
user.setEmail("fred@fredmeyer.com");