From 47b8d29b211c1a3644955ef768d01d2985a25dfc Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期二, 18 十月 2022 16:43:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 flower_city/src/main/java/com/dg/core/controller/CommonController.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/controller/CommonController.java b/flower_city/src/main/java/com/dg/core/controller/CommonController.java
index 843ca2e..98d31e0 100644
--- a/flower_city/src/main/java/com/dg/core/controller/CommonController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/CommonController.java
@@ -139,9 +139,9 @@
   }
 
   /**
-   * 通用上传请求(多个)
+   * 判断当前时间是否是工作日,格式为“2022-10-16”,不传默认为今天
    */
-  @ApiOperation("判断当前时间是否是工作日")
+  @ApiOperation("判断当前时间是否是工作日,格式为“2022-10-16”,不传默认为今天")
   @GetMapping("/isWeekday")
   public ResultData isWeekday(@RequestParam(value = "dateTime",required = false) String dateTime)
   {

--
Gitblit v1.7.1