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

fwq

2023-07-05 ba3d341a187b36ea5b9ed3266930d567c4774fcc

 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;