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

luodangjia

2024-07-23 9af336a5be2483d67b5dbbf02d87e1e54185014f

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/DateUtil.java

@@ -18,7 +18,7 @@
   
   
   
   private static TimeZone tz = TimeZone.getTimeZone("GMT+8");
   private static TimeZone tz = TimeZone.getTimeZone("GMT+0");

   // private static TimeZone tz = TimeZone.getTimeZone("Asia/Shanghai");