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

---
 flower_city/src/main/java/com/dg/core/controller/CommonController.java |    2 +-
 1 files changed, 1 insertions(+), 1 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..e3b0ba8 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
@@ -141,7 +141,7 @@
   /**
    * 通用上传请求(多个)
    */
-  @ApiOperation("判断当前时间是否是工作日")
+  @ApiOperation("判断当前时间是否是工作日,格式为“2022-10-16”,不传默认为今天")
   @GetMapping("/isWeekday")
   public ResultData isWeekday(@RequestParam(value = "dateTime",required = false) String dateTime)
   {

--
Gitblit v1.7.1