Merge branch 'dev' into dev_WMS20260401

# Conflicts: # mhd-user-center/src/main/resources/bootstrap.yml # mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java # mhd_oms/src/main/resources/bootstrap.yml # mhd_wms/src/main/resources/mapper/deliveTask/DeliveTaskMapper.xml
2026-06-16 11:11:48 +08:00
parent b05baac0e5 9922fee6cc
commit dd4fc13adc
46 changed files with 660 additions and 225 deletions
@@ -156,7 +156,10 @@ public class ExecuteOrderDTO extends BaseVOEntity{
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    private Date invoiceEndTime;

+    @ApiModelProperty("发票编号")
+    private String invoiceNumber;
+
    @ApiModelProperty("车次")
    private Integer trainNo;

-}
+}