Merge branch 'master-prod-new' into master-test

fwq

2024-02-29 41cd83bda10e3d21bf8e3812b5be931da8bc6f3a

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

@@ -14,6 +14,8 @@
    private String userId;
    /**卡包标识*/
    private String cardBagId;
    /**是否不查询取消的卡包:1不查看取消的卡包*/
    private Integer selectNoCancel;
    /**卡包有效状态*/
    private Integer effectiveStatus;
    /**操作员工标识*/