解决冲突

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/OrderMainReq.java

@@ -124,6 +124,8 @@ public class OrderMainReq extends BaseRequest {
 
     private List<OrderDetailReq> detailList;
 
+    private String receiveUserId;
+
 }