Merge branch 'V1.0.14' of http://39.99.141.0:10000/fjnx/soc into V1.0.14

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/letter/service/impl/CoreIntroduceLetterServiceImpl.java

@@ -1275,16 +1275,16 @@ public class CoreIntroduceLetterServiceImpl extends ServiceImpl<CoreIntroduceLet
     }
 
     private String dealTime(Date start, Date end) {
-        final SimpleDateFormat format = new SimpleDateFormat("yyyy年MM月dd日 HH时mm分");
+        final SimpleDateFormat format = new SimpleDateFormat("yyyy年MM月dd日");
         Calendar calendar = Calendar.getInstance();
         calendar.setTime(end);
         String d = String.valueOf(calendar.get(Calendar.DAY_OF_MONTH));
         if (d.length() == 1) {
-            d = "0" + calendar.get(Calendar.MINUTE);
+            d = "0" + calendar.get(Calendar.DAY_OF_MONTH);
         }
-        String m = String.valueOf(calendar.get(Calendar.MONTH));
+        String m = String.valueOf(calendar.get(Calendar.MONTH) + 1 );
         if (m.length() == 1) {
-            m = "0" + calendar.get(Calendar.HOUR_OF_DAY);
+            m = "0" + String.valueOf(calendar.get(Calendar.MONTH) + 1 ) ;
         }
         String dateStr = format.format(start) + "-" + m + "月" + d + "日";
         return dateStr;