Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-23 e2f232a6fc6404513ae53d69405d95d2eb9429ce

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


    /**