Merge remote-tracking branch 'origin/div' into div

admin

2020-07-01 055fb8d085efd7e120d69aba6c0fbb8db5867553

 fanli/src/main/java/com/yeshi/fanli/util/TimeUtil.java

@@ -65,6 +65,12 @@
      String date = sdf.format(new Date(time));

      return date;

   }

	
   public static String getGernalTime(Date date) {

      SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");

      return sdf.format(date);

   }





   public static String getGernalTime(long time, String format) {

      SimpleDateFormat sdf = new SimpleDateFormat(format);