Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7

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

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

}