Merge branch 'master-prod-new' into master-test

fhx

2023-11-02 58a203b55e76111f330b86e2125d40d75dbebe9a

 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;