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

fhx

2024-02-06 20825f31aba894bb3d588f0696584c4afe618d28

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

 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)*/

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

New file
@@ -0,0 +1,20 @@
package com.hz.his.vo.user;

import lombok.Data;

import java.math.BigDecimal;

/**
 *  SKU实体-热玛吉活动
 * */
@Data
public class UserCouponGoodsVo {

    /**商品标识*/
    private String goodsId;
    /**商品名称*/
    private String goodsName;
    /**商品名称*/
    private String goodsImg;

}