Merge branch 'huacheng_test' into haucheng_panzhihua

张天森

2022-11-25 61046f00aa8d504372a0fd6f26334846c4ba33dc

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