• 技术部-任文超's avatar
    Merge branch 'master' into feature/20171030 · 2ca85f0f
    技术部-任文超 authored
    # Conflicts:
    #	.gitignore
    #	src/main/java/cn/quantgroup/xyqb/Constants.java
    #	src/main/java/cn/quantgroup/xyqb/controller/internal/sms/SmsController.java
    #	src/main/java/cn/quantgroup/xyqb/controller/internal/user/UserController.java
    
    合并已上线的master分支(用户联系人校验+联系人脏数据过滤 功能)
    2ca85f0f
Name
Last commit
Last update
..
user/enums Loading commit data...
xyqb Loading commit data...