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

admin

2019-09-17 5eab2b71f0749e9f61fc83d9d7e03553e9fa75ef

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