From d323ac1bcf18215d6f96c4db82319be745950fe7 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 14 十月 2022 14:24:53 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ 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