Merge remote-tracking branch 'origin/developer' into developer

haoban-manage3-web/src/main/webapp/WEB-INF/spring-servlet.xml

@@ -30,6 +30,7 @@
 	<mvc:annotation-driven>
 		<!-- 设置不使用默认的消息转换器 -->
 		<mvc:message-converters register-defaults="false">
+			<bean class="com.gic.commons.util.DateConverter" />
 			<bean class="com.gic.haoban.manage.web.config.LongHttpMessageConverter"/>
 			<bean class="com.gic.haoban.common.ext.MappingJackson2HttpMessagePropertyViewConverter"/>
 			<bean class="org.springframework.http.converter.StringHttpMessageConverter">