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

yanghui

2022-10-13 f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0

 flower_city/src/main/java/com/dg/core/db/gen/mapper/ReplyTemplateMapper.java

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


    /**
@@ -49,7 +51,7 @@
     * 获取数量
     * @return
     */
    public int countNum(String Name);
    public int countNum(@Param("Name") String Name,@Param("ids") List<String> ids);