Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

16 小时以前 bd1d4feea4f9522c69ef4c0fd72b1221eae5201f

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/excel/PurchaseTemplate.java

@@ -8,6 +8,7 @@
import lombok.experimental.Accessors;

import java.io.Serializable;
import java.util.Date;

@Data
@ExcelAutoColumnSize
@@ -135,7 +136,7 @@
    @Excel(name = "预计送达时间")
    @ApiModelProperty("预计送达时间")
    @ExcelComment(value = "arrTime", example = "2025-05-21")
    private String arrTime;
    private Date arrTime;


    @Excel(name = "备注")