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

yanghui

2022-11-10 ec96abc7c3d9ef48b00c321eed85f9d934c699a5

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

@@ -26,8 +26,8 @@

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

    @Override