Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-14 f63faf6f110f3b1ce3f7d078ba378286b4808d4a

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