专辑操作记录
Merge branch 'dev_liqian' of https://github.com/liqian008/designer.git
into dev_liqian

Conflicts:
	designer-front/src/main/java/com/bruce/designer/front/controller/SystemController.java
	designer-service/src/main/java/com/bruce/designer/service/impl/CounterServiceImpl.java
	designer-service/src/main/resources/generatorConfig.xml
	designer-service/src/main/resources/mybatis-conf.xml