Merge remote-tracking branch 'origin/master'

Administrator

2018-11-23 9666caad786d890ace2df4594e71cee47bb489b9

 fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java

@@ -1637,10 +1637,10 @@
            bossData.put("portrait", boss.getPortrait());

         }

         

         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");

         SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");

         Long createTime = threeSale.getCreateTime();

         Date inviteTime = new Date(createTime);

         bossData.put("inviteTime", "邀请时间:" + sdf.format(inviteTime));

         bossData.put("inviteTime", "邀请时间: " + sdf.format(inviteTime));

      }

      

      

@@ -1695,6 +1695,7 @@
      } else {

         ThreeSaleExtraInfo extraInfo = list.get(0);

         extraInfo.setNickname(nickname);

         extraInfo.setUpdateTime(new Date());

         threeSaleExtraInfoSerivce.updateByPrimaryKey(extraInfo);

      }