Merge remote-tracking branch 'origin/master-prod-new' into master-test

fwq

2023-07-12 d07e5cacbf0f3c1e1b5b42e115e1de574de55aea

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

@@ -10,9 +10,12 @@
 */
@Data
public class CardBagDto extends PageDto {

    /**用户标识*/
    private String userId;
    /**卡包标识*/
    private String cardBagId;
    /**卡包有效状态*/
    private Integer effectiveStatus;
    /**操作员工标识*/
    private String opEmployeeId;
    /**操作门店标识*/