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

yanghui

2022-11-17 1de0a85c067ceb62413d0f458899dca41b8322d0

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

@@ -11,7 +11,8 @@
     * 获取模板列表
     * @return
     */
    public List<ReplyTemplateEntity> selectConfigList(IPage<ReplyTemplateEntity> page, Integer state,String Name);
    public List<ReplyTemplateEntity> selectConfigList(IPage<ReplyTemplateEntity> page, Integer state,
                                                      String Name,List<String> ids,String userId);

    /**
     * 获取详情
@@ -45,6 +46,6 @@
     * 获取数量
     * @return
     */
    public int countNum(String Name);
    public int countNum(String Name,List<String> ids);

}