From dc2145e16abaa09f89ab5319fc84c8a53e3cea69 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 13 十月 2022 17:19:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zigonggao_dev' into zigonggao_dev

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

diff --git a/flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java b/flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java
index 7bd2b3d..60291a6 100644
--- a/flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/ReplyTemplateController.java
@@ -85,7 +85,6 @@
         {
             return ResultData.error("模板名称不能为空");
         }
-
         entity.setId(null);
         entity.setDepartmentId(sysUser.getDepartmentId());
         entity.setCreateUserId(sysUser.getUserId()+"");

--
Gitblit v1.7.1