| commit | a61e0e7e41416c2fbb106b2a33b1d73a5617d3ce | |
| author | 尹建华 <yinjianhua@credithundred.com> | |
| Wed, 22 Jun 2016 12:00:05 +0000 (22 20:00 +0800) | ||
| committer | 尹建华 <yinjianhua@credithundred.com> | |
| Wed, 22 Jun 2016 12:00:05 +0000 (22 20:00 +0800) | ||
| tree | 938003ebb4ef8e616881b04b1cb3fe4781b4ccf8 | treesnapshot (tar.gz zip) |
| parent | 7f5a51ef77459bc533185e69de6f9489cbbd9300 | commitdiff |
| parent | 4caf8de0512ed91c341f242ee9b62f9b8764cf07 | commitdiff |
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# loan/loan-task/src/main/java/com/baibao/loan/task/CancelProductTask.java
# loan/loan-task/src/main/java/com/baibao/loan/task/service/LoanTaskService.java
# Conflicts:
# loan/loan-task/src/main/java/com/baibao/loan/task/CancelProductTask.java
# loan/loan-task/src/main/java/com/baibao/loan/task/service/LoanTaskService.java