修改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