Merge branch 'master-stander' into master-jiayan

fwq

10 小时以前 2bbf2a6d0b13772aa5254cb9e9271bd2e41d4061

 phis-feign/src/main/java/com/hz/his/vo/user/UserCouponDataVo.java

@@ -22,6 +22,11 @@
    /**加购指定的SKU*/
    private List<UserCouponSkuVo> addSkuList;

    /**指定的商品*/
    private List<UserCouponGoodsVo> goodsList;
    /**加购指定的商品*/
    private List<UserCouponGoodsVo> addGoodsList;

    /**是否已领取,默认只领取一次*/
    private Boolean isReceive = true;
    /**赠送优惠券类型:0无,1赠送大额(5000),2赠送小额(2500)*/