Merge branch 'master' into master-test

wangrenhuang

2023-11-06 e6760711ae80d54481d1cb7321e10a3c6f2cb795

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

@@ -42,6 +42,8 @@

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