Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-16 5ca8ff0110846078c80ac7e89b5e38bb8046c2a3

 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);
    }