Merge branch 'fhx-prod-复购活动' into master-test

fhx

2024-05-16 eba69ea7970d1abb5da1f8cc3294d777f1038ab2

 phis-feign/src/main/java/com/hz/his/dto/coupon/CouponGoodsDto.java

@@ -26,6 +26,8 @@
    private List<String> ids;
    /**商品类型*/
    private String goodsType;
    /*搜索参数*/
    private String keyWord;
    //使用类型
    private Integer useType;