并行开发。。。
 第一个
Merge remote-tracking branch 'origin/development_chen' into development
第二个
development 01
shan
Merge remote-tracking branch 'origin/development' into development_xing

Conflicts:
	llwsx/src/main/java/com/thinkgem/jeesite/modules/test/test01.java
Merge remote-tracking branch 'origin/development_xing' into development
Merge remote-tracking branch 'origin/development'

Conflicts:
	llwsx/src/main/webapp/WEB-INF/views/paymentManager/dd.txt