Merge remote-tracking branch 'origin/master'

zhangxu

2022-11-01 82c3f19b64db521d2a28c8e5fdae4cc37bdea628

Merge remote-tracking branch 'origin/master'

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

@@ -31,4 +31,6 @@
    private String userCardId;
    /*卡项id*/
    private String cardId;
    /*身体部位 */
    private String bodyPartType;
}

 phis-feign/src/main/java/com/hz/his/dto/user/card/UserCardDto.java

@@ -23,8 +23,10 @@
    private String effectiveStartTime;
    /**有效结束*/
    private String effectiveEndTime;
    /*是否SPA(0:否,1:是)*/
    /**是否SPA(0:否,1:是)*/
    private Integer isSpa;
    /**是否失效:0否1是,失效对应有效状态的4和5*/
    private Integer isInvalid;

}


 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipPreOrderService.java

@@ -50,4 +50,12 @@
    Result del(@RequestBody PreOrderDto preOrderDto);


    /**
     * 删除预约
     */
    @PostMapping(value = "/pre/order/updateStatus")
    Result updateStatus(@RequestBody PreOrderDto preOrderDto);



}