Merge remote-tracking branch 'origin/master'

jiangping

2024-11-18 81ba74daf8b7e7563bfadf4712c6a90d30434370

 server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java

@@ -1638,6 +1638,13 @@
            return "";
        }
    }
    public static String getFirstDayCurrentMonth() {
        try {
            return getDateLong(new Date()).substring(0, 7) + "-01";
        } catch (Exception e) {
            return "";
        }
    }

    /**
     * 将yyyyMM各式转换成yyyy年MM月格式