Merge branch 'master' into master-test

wangrenhuang

2023-04-18 cc35e61d33b2421344bb22eb1ba50d093eacb562

 phis-feign/src/main/java/com/hz/his/dto/preOrder/PreOrderItemDto.java

@@ -25,4 +25,12 @@
    private String goodsId;
    /* 项目名称*/
    private String goodsName;
    /*商品类型(OrderGoodsConstants)*/
    private String type;
    /*用户卡项 UserCard*/
    private String userCardId;
    /*卡项id*/
    private String cardId;
    /*身体部位 */
    private String bodyPartType;
}