Commits · 2971c58517c28e2a3c5ce24c5df74614e104ab61 · reyun / manager

20 Jun, 2018 1 commit
- adi · 2971c585
  manxiaoqiang authored Jun 20, 2018
  
  2971c585
08 Jun, 2018 4 commits
- Merge remote-tracking branch 'remotes/origin/20180530_bpu' · 18399e37
  manxiaoqiang authored Jun 08, 2018
```
* remotes/origin/20180530_bpu:
  adi
  adi
  adi
  adi
  adi
  adi
  adi
  adi
  adi
  adi
  bpu
  adi
  adi
```
  18399e37
- adi · 375c7ed7
  manxiaoqiang authored Jun 08, 2018
  
  375c7ed7
- adi · b25ff7cb
  manxiaoqiang authored Jun 08, 2018
  
  b25ff7cb
- adi · ac92d057
  manxiaoqiang authored Jun 08, 2018
  
  ac92d057
07 Jun, 2018 4 commits
- adi · b6cacf5a
  manxiaoqiang authored Jun 07, 2018
  
  b6cacf5a
- adi · 8114d630
  manxiaoqiang authored Jun 07, 2018
  
  8114d630
- adi · 0557ab59
  manxiaoqiang authored Jun 07, 2018
  
  0557ab59
- adi · 18c33ee3
  manxiaoqiang authored Jun 07, 2018
  
  18c33ee3
06 Jun, 2018 4 commits
- adi · f677dde1
  manxiaoqiang authored Jun 06, 2018
  
  f677dde1
- adi · c9169a52
  manxiaoqiang authored Jun 06, 2018
  
  c9169a52
- adi · 5e940cdf
  manxiaoqiang authored Jun 06, 2018
  
  5e940cdf
- Merge remote-tracking branch 'remotes/origin/20180525_adi' into 20180530_bpu · 31830e55
  manxiaoqiang authored Jun 06, 2018
```
* remotes/origin/20180525_adi:
  adi
  adi

# Conflicts:
#	.idea/workspace.xml
#	src/main/java/common/service/impl/ContractServiceImpl.java
```
  31830e55
05 Jun, 2018 1 commit
- bpu · 45a65f1c
  manxiaoqiang authored Jun 05, 2018
  
  45a65f1c
30 May, 2018 2 commits
- adi · eaabae4c
  manxiaoqiang authored May 30, 2018
  
  eaabae4c
- adi · 0e91d6b6
  manxiaoqiang authored May 30, 2018
  
  0e91d6b6
18 May, 2018 1 commit
- 2 · c5c1e13d
  manxiaoqiang authored May 18, 2018
  
  c5c1e13d
27 Apr, 2018 6 commits
- 2 · 5379bb67
  manxiaoqiang authored Apr 27, 2018
  
  5379bb67
- Merge remote-tracking branch 'remotes/origin/9637230e' · 4ef329b0
  manxiaoqiang authored Apr 27, 2018
```
* remotes/origin/9637230e: (51 commits)
  2
  2
  2
  2
  2
  2
  2
  2
  2
  2
  2
  2
  2
  2
  2
  2
  2
  2
  2
  2
  ...
```
  4ef329b0
- 2 · 9637230e
  manxiaoqiang authored Apr 27, 2018
  
  9637230e
- 2 · 7d847bc2
  manxiaoqiang authored Apr 27, 2018
  
  7d847bc2
- 2 · 2c9d31bd
  manxiaoqiang authored Apr 27, 2018
  
  2c9d31bd
- 2 · 4dbeecfe
  manxiaoqiang authored Apr 27, 2018
  
  4dbeecfe
26 Apr, 2018 10 commits
- 2 · 1e9950fa
  manxiaoqiang authored Apr 26, 2018
  
  1e9950fa
- 2 · b24a292f
  manxiaoqiang authored Apr 26, 2018
  
  b24a292f
- 2 · 9142ee27
  manxiaoqiang authored Apr 26, 2018
  
  9142ee27
- 2 · 0b3088ab
  manxiaoqiang authored Apr 26, 2018
  
  0b3088ab
- 2 · ea18bc2f
  manxiaoqiang authored Apr 26, 2018
  
  ea18bc2f
- 2 · a206c0cd
  manxiaoqiang authored Apr 26, 2018
  
  a206c0cd
- 2 · 8a2892f5
  manxiaoqiang authored Apr 26, 2018
  
  8a2892f5
- 2 · 7cc35fec
  manxiaoqiang authored Apr 26, 2018
  
  7cc35fec
- 2 · 2949c5ec
  manxiaoqiang authored Apr 26, 2018
  
  2949c5ec
- 2 · 54452c6a
  manxiaoqiang authored Apr 26, 2018
  
  54452c6a
25 Apr, 2018 7 commits
- 2 · 92a07781
  manxiaoqiang authored Apr 25, 2018
  
  92a07781
- 2 · 68585343
  manxiaoqiang authored Apr 25, 2018
  
  68585343
- 2 · fd059d16
  manxiaoqiang authored Apr 25, 2018
  
  fd059d16
- 2 · 0d66e633
  manxiaoqiang authored Apr 25, 2018
  
  0d66e633
- 2 · d205ff9a
  manxiaoqiang authored Apr 25, 2018
  
  d205ff9a
- 2 · a0190bdf
  manxiaoqiang authored Apr 25, 2018
  
  a0190bdf
- 2 · a8a7bcf4
  manxiaoqiang authored Apr 25, 2018
  
  a8a7bcf4