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

yanghui

2022-10-14 4040856595952ea0b8f8b764ba2770d5c244c891

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