Merge branch 'master' into master-test

zhangxu

2022-11-23 1c744733a032b1da5d429830268a6314b39eba09

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

@@ -29,4 +29,8 @@
    private String type;
    /*用户卡项 UserCard*/
    private String userCardId;
    /*卡项id*/
    private String cardId;
    /*身体部位 */
    private String bodyPartType;
}