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

lidongdong

2022-11-10 bdbe40f077aa9ca2ec184707d3eab41af13def03

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

@@ -50,7 +50,7 @@
        {
            return getDataTable("您没有权限查看该数据");
        }
        List<ReplyTemplateEntity> list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids);
        List<ReplyTemplateEntity> list = iReplyTemplateService.selectConfigList(pageParam,pageSize,Name,ids,null);
        int num=iReplyTemplateService.countNum(Name,ids);
        return getDataTable(list,num);
    }