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

admin

2019-10-17 143160118ab3937ae9e340f61aafa764756856c8

 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();