From 5981b2cae7c20ec9021c8ccbe1a926f35f640210 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 03 一月 2019 17:43:18 +0800
Subject: [PATCH] Merge branch 'dev-hongbao'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java
index a5a7035..325dfe8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java
@@ -517,10 +517,10 @@
if (formatYears.format(todayTime).equals(formatYears.format(lastLoginTime))) {
// 鏈勾
- contentJson.put("content", "鏈�杩戠櫥闄� " + sdf.format(lastLoginTime));
+ contentJson.put("content", "鏈�杩戠櫥褰� " + sdf.format(lastLoginTime));
} else {
// 寰�骞�
- contentJson.put("content", "鏈�杩戠櫥闄� " + format.format(lastLoginTime));
+ contentJson.put("content", "鏈�杩戠櫥褰� " + format.format(lastLoginTime));
}
array.add(contentJson);
--
Gitblit v1.8.0