Merge remote-tracking branch 'origin/master'

fwq

2022-08-31 32bf00ebc825716caf9424a137df7c5adf7f39ac

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

@@ -3,6 +3,8 @@
import com.hz.his.dto.PageDto;
import lombok.Data;

import java.util.List;

/**
 * Created with IntelliJ IDEA.
 *
@@ -18,7 +20,10 @@
    private String operatorId;
    //操作人门店标识，必填
    private String shopId;
    //总订单信息，必填
    private OrdersTotalDto ordersTotal;
    private OrderItemDto orderItem;
    //一级子订单，必填
    private List<OrderItemDto> orderItem;
    //开发人集合
    private OrderDeveloperDto orderDeveloper;
}