Commit 60b6d1dc authored by yanzg's avatar yanzg

Default Changelist

parent 961d5883
...@@ -93,7 +93,7 @@ public class DateHelper { ...@@ -93,7 +93,7 @@ public class DateHelper {
* @param time 时间 * @param time 时间
* @return today(日期)+时间 * @return today(日期)+时间
*/ */
public static Date getTodayTime(Object today, String time) { public static Date mergeTodayTime(Object today, String time) {
if (StringHelper.isEmpty(today)) { if (StringHelper.isEmpty(today)) {
return null; return null;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment