java-project/baiyue-firstleg
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	lastleg-service/src/main/resources/openapi/overseas-business-v1.yaml
This commit is contained in:
ouyangxq
2026-10-09 16:13:28 +08:00
parent 3b5454fb99 bac7e0b214
commit c1aaaf207a
39 changed files with 990 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lastleg-service/src/main/java/com/baiyue/lastleg/dto/LastlegOrderDetailResponse.java
+6 -1
View File
@@ -13,8 +13,13 @@ public record LastlegOrderDetailResponse(
List<LastlegOrderDetail> cargo,
List<History> statusHistory,
List<OverseasFeeSource> fees,
List<Operation> operationHistory
List<Operation> operationHistory,
com.baiyue.lastleg.returnreceipt.dto.ReturnOrderResponses.Detail returnReceipt
) {
public LastlegOrderDetailResponse(LastlegOrderSummary order, List<LastlegOrderCommandDtos.ManualNodeView> manualNodes,
List<LastlegOrderDetail> cargo, List<History> statusHistory, List<OverseasFeeSource> fees, List<Operation> operationHistory) {
this(order, manualNodes, cargo, statusHistory, fees, operationHistory, null);
}
public record History(Long id, String fromStatus, String toStatus, String remark, LocalDateTime createdAt) {}
public record Operation(Long id, String operationNode, String operatorName, String result, LocalDateTime createdAt) {}
}