Merge remote-tracking branch 'origin/master'

zhangxu

2022-11-01 82c3f19b64db521d2a28c8e5fdae4cc37bdea628

 phis-feign/src/main/java/com/hz/his/dto/marketing/OrderCancelDto.java

@@ -11,6 +11,4 @@
    /*******************必填项(注意继承的公共类MarketingDto)*************************/
    /**订单标识*/
    private String orderId;
    /**订单号*/
    private String orderNo;
}