Merge branch 'gzdyh_test' into gzdyh_grid

xusd

2024-10-28 b0b1e641a31a0494262187f97034807fc53515dd

 dyh-service/dyh-base/src/main/java/cn/huge/base/common/utils/DateUtils.java

@@ -174,7 +174,7 @@
    * 获取当前时间
    * @return Date
    */
   public static Date getMowDate(){
   public static Date getNowDate(){
      return new Date();
   }

@@ -971,6 +971,19 @@
      }
      return year+"年"+month+"月"+day+"日";
   }

   /**
    * 获取两个时间的小时差
    * */
   public static Integer getDifferHour(Date time1,Date time2){
      if(ObjectUtils.isNotEmpty(time1) && ObjectUtils.isNotEmpty(time2)){
         long housrs = 1000 * 60 * 60;
         long differ = time1.getTime() - time2.getTime();
         long housr = differ / housrs;
         return Integer.valueOf(String.valueOf(housr));
      }
      return 0;
   }
}
/**
 * -------------------_ooOoo_-------------------