Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈

云

2026-05-21 0d7d874912d0147376826b55667a1deb6547ed91

 src/main/java/com/ruoyi/sales/excel/InvoiceRegisAndProductExcelDto.java

@@ -2,7 +2,7 @@

import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;