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

wangrenhuang

2023-11-15 af486b86b33eaa1697b9d45801bfb86144e6c44a

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

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