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

admin

2019-10-12 4706fa0dcd761c13f0f7f33e4e7ab804e0a21f4f

 fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserSystemMsgServiceImpl.java

@@ -118,7 +118,7 @@


   @Override

   public void syncSystemZNX(Long uid) {

      UserInfo user = userInfoMapper.selectByPrimaryKey(uid);

      UserInfo user = userInfoMapper.selectAvailableByPrimaryKey(uid);

      if (user == null)

         return;

      long createTime = user.getCreatetime();