Commits · a7d0155a501693b19c635a248430f4562e155cfe · head_group / xyqb-user2

03 Jan, 2017 3 commits
- first login · a7d0155a
  zhouqian authored Jan 03, 2017
  
  a7d0155a
- first login · f9413568
  zhouqian authored Jan 03, 2017
  
  f9413568
- first login · 1fe14fd0
  zhouqian authored Jan 03, 2017
  
  1fe14fd0
30 Dec, 2016 18 commits
- session管理 · f1524c3a
  zhouqian authored Dec 30, 2016
  
  f1524c3a
- login info · d892c3da
  zhouqian authored Dec 30, 2016
  
  d892c3da
- login info · b8f53625
  zhouqian authored Dec 30, 2016
  
  b8f53625
- refactor · 2a78d659
  zhouqian authored Dec 30, 2016
  
  2a78d659
- Merge branch 'master' of http://gitabc.xyqb.com/head_group/xyqb-user2 · 270c84d0
  zhouqian authored Dec 30, 2016
```
# Conflicts:
#	src/main/java/cn/quantgroup/xyqb/controller/internal/user/UserController.java
```
  270c84d0
- change something · 178a551d
  lee_mingzhu authored Dec 30, 2016
  
  178a551d
- change something · 611f0d85
  lee_mingzhu authored Dec 30, 2016
  
  611f0d85
- Merge branch 'master' of http://gitabc.xyqb.com/head_group/xyqb-user2 · 9a6bbb72
  zhouqian authored Dec 30, 2016
  
  9a6bbb72
- change something · 15f800f7
  lee_mingzhu authored Dec 30, 2016
  
  15f800f7
- rename some method, clear the semantic · 656586ed
  zhouqian authored Dec 30, 2016
  
  656586ed
- change something · cfb2a0e0
  lee_mingzhu authored Dec 30, 2016
  
  cfb2a0e0
- rename some method, clear the semantic · 892d1ba3
  zhouqian authored Dec 30, 2016
  
  892d1ba3
- rename some method, clear the semantic · f1716855
  zhouqian authored Dec 30, 2016
  
  f1716855
- Merge branch 'master' of http://gitabc.xyqb.com/head_group/xyqb-user2 · be2f3610
  zhouqian authored Dec 30, 2016
  
  be2f3610
- Merge branch 'master' of http://gitabc.xyqb.com/head_group/xyqb-user2 · 3b0a0ded
  zhouqian authored Dec 30, 2016
```
# Conflicts:
#	src/main/java/cn/quantgroup/xyqb/Constants.java
```
  3b0a0ded
- change something · 862e9fe5
  lee_mingzhu authored Dec 30, 2016
  
  862e9fe5
- change something · adee1121
  lee_mingzhu authored Dec 30, 2016
  
  adee1121
- change something · e4637ce4
  lee_mingzhu authored Dec 30, 2016
  
  e4637ce4
29 Dec, 2016 19 commits
- Merge remote-tracking branch 'origin/master' · 26ab629e
  lee_mingzhu authored Dec 29, 2016
  
  26ab629e
- filter · c4195364
  lee_mingzhu authored Dec 29, 2016
  
  c4195364
- Merge branch 'master' of http://gitabc.xyqb.com/head_group/xyqb-user2 · 4222d919
  zhouqian authored Dec 29, 2016
```
# Conflicts:
#	src/main/java/cn/quantgroup/xyqb/Constants.java
```
  4222d919
- Merge branch 'master' of http://gitabc.xyqb.com/head_group/xyqb-user2 · 77e20b3b
  zhouqian authored Dec 29, 2016
  
  77e20b3b
- Merge branch 'master' of http://gitabc.xyqb.com/head_group/xyqb-user2 · 47fcd152
  zhouqian authored Dec 29, 2016
```
# Conflicts:
#	src/main/java/cn/quantgroup/xyqb/Constants.java
```
  47fcd152
- filter · eb925cd3
  lee_mingzhu authored Dec 29, 2016
  
  eb925cd3
- Merge branch 'master' of http://gitabc.xyqb.com/head_group/xyqb-user2 · 033e1c63
  zhouqian authored Dec 29, 2016
```
# Conflicts:
#	src/main/java/cn/quantgroup/xyqb/Constants.java
```
  033e1c63
- Merge branch 'master' of http://gitabc.xyqb.com/head_group/xyqb-user2 · 126e147d
  zhouqian authored Dec 29, 2016
```
# Conflicts:
#	src/main/java/cn/quantgroup/xyqb/Constants.java
```
  126e147d
- filter · 61890f3e
  lee_mingzhu authored Dec 29, 2016
  
  61890f3e
- Merge branch 'master' of http://gitabc.xyqb.com/head_group/xyqb-user2 · 0b080fcc
  zhouqian authored Dec 29, 2016
```
# Conflicts:
#	src/main/java/cn/quantgroup/xyqb/Constants.java
```
  0b080fcc
- filter · ab2a91da
  lee_mingzhu authored Dec 29, 2016
  
  ab2a91da
- Merge branch 'master' of http://gitabc.xyqb.com/head_group/xyqb-user2 · 1dad4c07
  zhouqian authored Dec 29, 2016
```
# Conflicts:
#	src/main/java/cn/quantgroup/xyqb/Constants.java
```
  1dad4c07
- Merge branch 'master' of http://gitabc.xyqb.com/head_group/xyqb-user2 · 455b3cb6
  zhouqian authored Dec 29, 2016
```
# Conflicts:
#	src/main/java/cn/quantgroup/xyqb/Constants.java
```
  455b3cb6
- 好多东西 · abb505cc
  zhouqian authored Dec 29, 2016
  
  abb505cc
- delete nerver used import · dacfaa5e
  lee_mingzhu authored Dec 29, 2016
  
  dacfaa5e
- add constant · 332a7ba0
  lee_mingzhu authored Dec 29, 2016
  
  332a7ba0
- 好多东西 · c5b69cf5
  zhouqian authored Dec 29, 2016
  
  c5b69cf5
- remove google gson package and sun package of base64 · a07a7965
  lee_mingzhu authored Dec 29, 2016
  
  a07a7965
- remove google gson package and sun package of base64 · 65f41783
  lee_mingzhu authored Dec 29, 2016
  
  65f41783