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

fwq

2022-12-12 9c39ba929e5faba2123fcfb843c0a3a18bed3ee1

 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;