first commit
初次添加
delete environment files
第二次添加
Merge remote-tracking branch 'origin/master'
compaign
提交--
Merge remote-tracking branch 'origin/master'
compaign
Merge remote-tracking branch 'origin/master'
提交--
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/Member.java
提交--
提交--
compaign execute
提交--
Merge remote-tracking branch 'origin/master'
提交--
提交--
message queue client