Merge branch 'cc_20250513_franchise_report' into 'master'

报表导出

See merge request hangzhou/java/custom_zxjp!86
This commit is contained in:
苏竹红
2025-05-16 10:22:36 +00:00
2 changed files with 27 additions and 2 deletions

View File

@@ -79,13 +79,18 @@ public class FranchiseReportResponse {
@ColumnWidth(20)
private BigDecimal loanMarginTotal = BigDecimal.ZERO;
@ApiModelProperty(value = "收款金额总计")
@ExcelProperty(value = "收款金额总计=加盟费+管理/品牌/设计费+保证金",order = 13)
@ColumnWidth(25)
private BigDecimal total = BigDecimal.ZERO;
@ApiModelProperty(value = "昨日日期")
@ExcelProperty(value = "昨日日期",order = 13)
@ExcelProperty(value = "昨日日期",order = 14)
@ColumnWidth(15)
private String yesterdayDate;
@ApiModelProperty(value = "昨天门店数")
@ExcelProperty(value = "昨天门店数",order = 14)
@ExcelProperty(value = "昨天门店数",order = 15)
@ColumnWidth(15)
private Integer yesterdayStoreNum = 0;
@ExcelIgnore