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

张天森

2022-10-13 2c19b79eade460a50f0d61b2e41e46662286934e

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