From 91a88471d84246524548a318aec1f22735cfedc9 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 13 Jul 2021 15:48:46 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

---
 screen-common/src/main/java/com/moral/util/DateUtils.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/screen-common/src/main/java/com/moral/util/DateUtils.java b/screen-common/src/main/java/com/moral/util/DateUtils.java
index 99a7243..5fde952 100644
--- a/screen-common/src/main/java/com/moral/util/DateUtils.java
+++ b/screen-common/src/main/java/com/moral/util/DateUtils.java
@@ -1312,7 +1312,7 @@
     }
 
     //���������������
-    public static Date geLastWeekMonday() {
+    public static Date getLastWeekMonday() {
         Calendar cal = Calendar.getInstance();
         cal.setTime(getDate(getMondayOfThisWeek(), yyyy_MM_dd_EN));
         cal.add(Calendar.DATE, -7);

--
Gitblit v1.8.0