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

张天森

2022-10-10 cf278d818b0f9d6b6b4f86334cb00fb114745ca8

 flower_city/src/main/java/com/dg/core/service/impl/ReplyTemplateImpl.java

@@ -15,8 +15,9 @@
{

    @Override
    public List<ReplyTemplateEntity> selectConfigList(IPage<ReplyTemplateEntity> page, Integer state,String Name) {
        return baseMapper.selectConfigList(page,state,Name);
    public List<ReplyTemplateEntity> selectConfigList(IPage<ReplyTemplateEntity> page,
                                                      Integer state,String Name,List<String> ids) {
        return baseMapper.selectConfigList(page,state,Name,ids);
    }

    @Override
@@ -40,7 +41,7 @@
    }

    @Override
    public int countNum(String Name) {
        return baseMapper.countNum(Name);
    public int countNum(String Name,List<String> ids) {
        return baseMapper.countNum(Name,ids);
    }
}