Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-14 afd18cde31a3c77ad0fabe73945a3f18cb6a3680

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

    /**
     * 获取详情