Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-17 19b801af62236e7401ca6607b9c65181306e01b4

 flower_city/src/main/java/com/dg/core/service/IReplyTemplateService.java

@@ -12,7 +12,7 @@
     * @return
     */
    public List<ReplyTemplateEntity> selectConfigList(IPage<ReplyTemplateEntity> page, Integer state,
                                                      String Name,List<String> ids);
                                                      String Name,List<String> ids,String userId);

    /**
     * 获取详情