Merge branch 'feature/20180108' into feature/junit_test

# Conflicts: # src/main/java/cn/quantgroup/xyqb/controller/external/user/InnerController.java

Merge branch 'feature/20180108' into feature/junit_test
# Conflicts: # src/main/java/cn/quantgroup/xyqb/controller/external/user/InnerController.java
0d438472 · 技术部-任文超 · c165e56f · 2fce4508 · 0d438472
Commit 0d438472 authored Jan 16, 2018 by 技术部-任文超
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 267 additions and 100 deletions

InnerController.java ...tgroup/xyqb/controller/external/user/InnerController.java +267 -100

No files found.
--- a/src/main/java/cn/quantgroup/xyqb/controller/external/user/InnerController.java
+++ b/src/main/java/cn/quantgroup/xyqb/controller/external/user/InnerController.java