Merge remote-tracking branch 'origin/master' into master_develop

yujian

2019-05-08 5e88359d7210039a6b1525bd5ffc20f24f2b5e01

 fanli/src/main/java/com/yeshi/fanli/util/factory/AccountMessageFactory.java

@@ -4,9 +4,9 @@
import java.text.MessageFormat;

import java.util.Map;



import com.yeshi.fanli.dto.HongBao;

import com.yeshi.fanli.entity.bus.user.AccountMessage;

import com.yeshi.fanli.entity.bus.user.Extract;

import com.yeshi.fanli.entity.bus.user.HongBao;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.PropertiesUtil;