增加上传功能
Merge branch 'dev_liqian' of https://github.com/liqian008/designer.git
into dev_liqian
Merge branch 'dev_liqian' of https://github.com/liqian008/designer.git
into dev_liqian
Merge branch 'dev_liqian' of https://github.com/liqian008/designer.git
into dev_liqian
增加qq登录
增加qq登录
Merge branch 'dev_liqian' of https://github.com/liqian008/designer.git into dev_liqian
qq登录可用
上传头像、裁图功能
申请设计师
Merge branch 'dev_liqian' of https://github.com/liqian008/designer.git
into dev_liqian

Conflicts:
	designer-front/src/main/webapp/WEB-INF/jsp/testAvatar.jsp
designer
Merge branch 'dev_liqian' of https://github.com/liqian008/designer.git
into dev_liqian
g
修改designer
Merge branch 'dev_liqian' of https://github.com/liqian008/designer.git
into dev_liqian

Conflicts:
	designer-front/src/main/schema/designer.sql
	designer-service/src/main/java/com/bruce/designer/bean/User.java
	designer-service/src/main/java/com/bruce/designer/bean/UserCriteria.java
	designer-service/src/main/java/com/bruce/designer/bean/mapper/UserMapper.xml
	designer-service/src/main/java/com/bruce/designer/dao/UserMapper.java
	designer-service/src/main/java/com/bruce/designer/service/impl/UserServiceImpl.java
修改setting
Merge branch 'dev_liqian' of https://github.com/liqian008/designer.git
into dev_liqian
settings
settings