From 6f302d5dcd1d47a9512151d4e31078bc98c62f08 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期二, 18 十月 2022 18:31:17 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ 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 e3b0ba8..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,7 +139,7 @@
   }
 
   /**
-   * 通用上传请求(多个)
+   * 判断当前时间是否是工作日,格式为“2022-10-16”,不传默认为今天
    */
   @ApiOperation("判断当前时间是否是工作日,格式为“2022-10-16”,不传默认为今天")
   @GetMapping("/isWeekday")

--
Gitblit v1.7.1