Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-10-28 bf5c02aaecb3f7a42daa4fa356c62a2e6bca0db5

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

@@ -102,6 +102,12 @@
      }

      return 0;

   }

	
   public static String formatDate(Date time) {

      SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd HH:mm");

      String date = sdf.format(time);

      return date;

   }



   public static long convertToTimeTemp(String st, String format) {

      Date date = new Date();