From 626317c580cce67668481e48e10fc4a4fb818678 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 19 八月 2019 09:31:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mater-1.6.0' into mater-1.6.0

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/UserMoneyDetailFactory.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/UserMoneyDetailFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/UserMoneyDetailFactory.java
index ec75fd8..3ebda64 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/UserMoneyDetailFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/UserMoneyDetailFactory.java
@@ -77,7 +77,7 @@
 		ca.setTime(time);
 		ca.add(Calendar.MONTH, -1);
 
-		String timeF = TimeUtil.getGernalTime(ca.getTimeInMillis(), "yyyy骞碝M鏈�");
+		String timeF = TimeUtil.getGernalTime(ca.getTimeInMillis(), "yyyy.M");
 
 		UserMoneyDetail detail = new UserMoneyDetail();
 		detail.setCreateTime(new Date());
@@ -119,7 +119,7 @@
 		ca.setTime(time);
 		ca.add(Calendar.MONTH, -1);
 
-		String timeF = TimeUtil.getGernalTime(ca.getTimeInMillis(), "yyyy骞碝M鏈�");
+		String timeF = TimeUtil.getGernalTime(ca.getTimeInMillis(), "yyyy.M");
 
 		UserMoneyDetail detail = new UserMoneyDetail();
 		detail.setCreateTime(new Date());

--
Gitblit v1.8.0