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

fhx

2023-06-29 0819cfd8b16e614936d047f8e3b01fe663d4f3a5

 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;