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

chenjiahe

2023-08-23 72a7f0ff972cb612e5793fc86996c31b70e1a969

 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;