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

云

6 天以前 dc9c6c612cde7b938c6851383b9da99abab025a4

 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;