Merge remote-tracking branch 'origin/master-prod-new' into master-test

fwq

2023-07-12 d07e5cacbf0f3c1e1b5b42e115e1de574de55aea

 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;