Merge branch 'master-stander' into master-jiayan-test

fhx

2024-08-16 c7b09c36a2b7082a57c776496b69b4173b4a1007

 phis-feign/src/main/java/com/hz/his/dto/order/OrderDto.java

@@ -42,6 +42,13 @@

    /**是否查询积分订单*/
    private Integer isIntegral;
    //是否查询已完成订单
    /**是否查询已完成订单*/
    private Integer isSuc;
    /**是否查询拼团 0 否 1 是*/
    private Integer isGroupBuy;

    /**是否过滤已退款的单 0 否 1 是*/
    private Integer isRefund;
    /** 是否剔除卡包订单 */
    private Integer isNotCardBag;
}