From cc8dde277662541904d302033820cf0cb2ab95af Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@S0ZHK00LKCA6OYY>
Date: 星期一, 26 十一月 2018 14:17:16 +0800
Subject: [PATCH] Merge branch 'dev-goods'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
index 05f8a66..2557474 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
@@ -1637,7 +1637,7 @@
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));
@@ -1695,6 +1695,7 @@
} else {
ThreeSaleExtraInfo extraInfo = list.get(0);
extraInfo.setNickname(nickname);
+ extraInfo.setUpdateTime(new Date());
threeSaleExtraInfoSerivce.updateByPrimaryKey(extraInfo);
}
--
Gitblit v1.8.0