Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-12-05 e15953aee9418b28d324a67bc9daf8e1ff831c7d

 flower_city/src/main/java/com/dg/core/api/ReplyTemplateAppletsController.java

@@ -45,7 +45,6 @@
                                          @CurrentUser SysUser sysUser)
    {
        Page<ReplyTemplateEntity> pageParam = new Page<>(pageNum,pageSize);
        sysUser.setDepartmentId("1202");
        List<String> ids= PermissionUtil.getStairDepartment(sysUser,iOrganizationChartService);
        if(ids==null || ids.size()<1)
        {