Default Changelist

yzg-util-base/src/main/java/com/yanzuoguang/util/helper/DateHelper.java

@@ -93,7 +93,7 @@ public class DateHelper {
      * @param time  时间
      * @return today(日期)+时间
      */
-    public static Date getTodayTime(Object today, String time) {
+    public static Date mergeTodayTime(Object today, String time) {
         if (StringHelper.isEmpty(today)) {
             return null;
         }