Merge remote-tracking branch 'origin/master'

RvWrapper/src/main/java/com/ruiwenliu/wrapper/util/TimeManager.java

@@ -82,4 +82,11 @@ public class TimeManager {
         Date date = new Date(lt);
         return simpleDateFormat.format(date);
     }
+
+    public static String stampToDate2(String s){
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd  HH:mm:ss");
+        long lt = new Long(s);
+        Date date = new Date(lt);
+        return simpleDateFormat.format(date);
+    }
 }