Merge branch 'master-prod-new'

wangrenhuang

2023-06-25 1dc7fbb61a5582c18ee383fcb26e58cf01bbbef8

 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;