Merge remote-tracking branch 'origin/master'

zhangxu

2022-08-31 7987fd29be9bc08a36b949aa18b3703fb91759a5

 phis-feign/src/main/java/com/hz/his/dto/user/coupon/OrderUseGoodsDto.java

@@ -13,7 +13,7 @@
    /**CRM sku标识*/
    private String skuId;
    /**商品类型*/
    private String goodsType;
    private Integer goodsType;
    /** his类型 */
    private String hisType;