Merge branch 'huacheng_test' into haucheng_panzhihua

张天森

2022-11-25 0f3db47c9a6c03611ac75118017f83d18ae062f2

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

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


    /**