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

chenjiahe

2023-09-05 2f2a95fb5b03338b84d8d92a61e9a3281c2495e6

 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;