Merge remote-tracking branch 'origin/zigonggao_dev' into zigonggao_dev

lidongdong

2022-10-13 dc2145e16abaa09f89ab5319fc84c8a53e3cea69

 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()+"");