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

zhangxu

2022-12-02 596fbb32e2a26579b66818e33ed472d74c1c070a

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

@@ -42,4 +42,6 @@

    /**是否查询积分订单*/
    private Integer isIntegral;
    //是否查询已完成订单
    private Integer isSuc;
}