Merge branch 'master-base' into master-test

fhx

2024-08-02 bc798685f11aeec95e64c25b0a4594d8876d881d

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

@@ -21,7 +21,7 @@
    private String hisId;
    /**商品phis类型*/
    private String hisType;
    /**商品所属phis分类标识集合*/
    /**商品所属phis分类标识集合-不用传*/
    private List<String> hisTypeIdList;
    /**单个商品金额*/
    private BigDecimal price;