Merge remote-tracking branch 'origin/dev' into dev_

jinpengyong

2021-11-02 6cc2a1d726e1019079b6d3fa74599426a359c001

 screen-common/src/main/java/com/moral/util/DateUtils.java

@@ -1117,6 +1117,7 @@
        return todayStart.getTime().getTime();
    }


    public static Integer getTodayInt() {
        return (int) (getTodayTime() / 1000);
    }