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

admin

2019-08-27 6b12faed50dda2d32c4dc2e60db59aaa721d7813

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java

@@ -12,6 +12,7 @@
import javax.servlet.http.HttpServletRequest;

import javax.servlet.http.HttpSession;



import org.springframework.context.annotation.Lazy;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

import org.yeshi.utils.JsonUtil;

@@ -112,6 +113,7 @@
   private JedisPool jedisPool;

   

   

   @Lazy

   @Resource

   private UserInfoModifyRecordService userInfoModifyRecordService;