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

liyong

9 天以前 88e384da863bb2f7324cb1e1474885df3b7cce91

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/MesWmSalesNoticeRespVO.java

@@ -24,10 +24,6 @@
    @ExcelProperty("通知单名称")
    private String name;

    @Schema(description = "销售订单编号", example = "SO202603010001")
    @ExcelProperty("销售订单编号")
    private String salesOrderCode;

    @Schema(description = "客户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
    private Long clientId;

@@ -39,6 +35,13 @@
    @ExcelProperty("客户名称")
    private String clientName;

    @Schema(description = "销售订单ID", example = "1")
    private Long saleOrderId;

    @Schema(description = "销售订单号", example = "SO202603010001")
    @ExcelProperty("销售订单号")
    private String saleOrderCode;

    @Schema(description = "发货日期", requiredMode = Schema.RequiredMode.REQUIRED)
    @ExcelProperty("发货日期")
    private LocalDateTime salesDate;