sitemap
Merge branch 'dev_liqian' of https://github.com/liqian008/designer into
dev_liqian

Conflicts:
	designer-front/src/main/java/com/bruce/designer/front/util/SitemapGenerator.java
	designer-front/src/main/resources/conf/site_config.properties