From b570615eb2c3e1c5f3f2a3dc046d00a64fc2a39e Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 17 七月 2024 09:44:10 +0800
Subject: [PATCH] 合并冲突

---
 src/util/date.js |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/util/date.js b/src/util/date.js
index 427486b..03629d0 100644
--- a/src/util/date.js
+++ b/src/util/date.js
@@ -1,8 +1,7 @@
 /**
  * 鑾峰彇骞存湀鏃�
  */
-export function getYearAndMonthAndDays() {
-  const date = new Date()
+export function getYearAndMonthAndDays(date=new Date()) {
   let year = date.getFullYear()
   let month = date.getMonth() + 1
   if (month < 10) {

--
Gitblit v1.9.3