导出加字段

coolstore-partner-model/src/main/java/com/cool/store/dto/ExportJoinShopDTO.java

@@ -76,95 +76,107 @@ public class ExportJoinShopDTO {
     @ColumnWidth(20)
     private String contractCode;
 
-    @ExcelProperty(value = "第一年加盟开始日期", order = 17)
+    @ExcelProperty(value = "合同签约时间", order = 17)
     @ColumnWidth(30)
-    private String firstYearStartTime;
+    private String contractSignTime;
 
-    @ExcelProperty(value = "第一年管理费到期日期", order = 18)
+    @ExcelProperty(value = "合同开始时间", order = 18)
     @ColumnWidth(30)
-    private String firstYearEndTime;
+    private String contractStartTime;
 
-    @ExcelProperty(value = "加盟费（含税）", order = 19)
+    @ExcelProperty(value = "合同结束时间", order = 19)
+    @ColumnWidth(30)
+    private String contractEndTime;
+
+    @ExcelProperty(value = "第几家分店", order = 20)
+    @ColumnWidth(20)
+    private Integer partnershipSignatoryFirstWhichStore;
+
+    @ExcelProperty(value = "保护距离", order = 21)
+    @ColumnWidth(20)
+    private Integer protectiveDistance;
+
+    @ExcelProperty(value = "加盟费（含税）", order = 22)
     @ColumnWidth(20)
     private String franchiseFee;
 
-    @ExcelProperty(value = "第一年度管理费（含税）", order = 20)
+    @ExcelProperty(value = "第一年度管理费（含税）", order = 23)
     @ColumnWidth(40)
     private String firstYearManagementFee;
 
-    @ExcelProperty(value = "设计费（含税）", order = 21)
+    @ExcelProperty(value = "设计费（含税）", order = 24)
     @ColumnWidth(20)
     private String performanceBond;
 
-    @ExcelProperty(value = "保证金（含税）", order = 22)
+    @ExcelProperty(value = "保证金（含税）", order = 25)
     @ColumnWidth(20)
     private String loanMargin;
 
-    @ExcelProperty(value = "第一年度品牌使用费（含税）", order = 23)
+    @ExcelProperty(value = "第一年度品牌使用费（含税）", order = 26)
     @ColumnWidth(40)
     private String firstYearFee;
 
-    @ExcelProperty(value = "合计缴费金额（含税）", order = 24)
+    @ExcelProperty(value = "合计缴费金额（含税）", order = 27)
     @ColumnWidth(30)
     private String totalAmountContributions;
 
-    @ExcelProperty(value = "加盟费优惠原因", order = 25)
+    @ExcelProperty(value = "加盟费优惠原因", order = 28)
     @ColumnWidth(30)
     private String discountReason;
 
-    @ExcelProperty(value = "店面租金", order = 26)
+    @ExcelProperty(value = "店面租金", order = 29)
     @ColumnWidth(20)
     private String monthRent;
 
-    @ExcelProperty(value = "省", order = 27)
+    @ExcelProperty(value = "省", order = 30)
     @ColumnWidth(15)
     private String province;
 
-    @ExcelProperty(value = "市", order = 28)
+    @ExcelProperty(value = "市", order = 31)
     @ColumnWidth(15)
     private String city;
 
-    @ExcelProperty(value = "区", order = 29)
+    @ExcelProperty(value = "区", order = 32)
     @ColumnWidth(15)
     private String district;
 
-    @ExcelProperty(value = "场地实际面积", order = 30)
+    @ExcelProperty(value = "场地实际面积", order = 33)
     @ColumnWidth(15)
     private String area;
 
-    @ExcelProperty(value = "报货物流仓库", order = 31)
+    @ExcelProperty(value = "报货物流仓库", order = 34)
     @ColumnWidth(25)
     private String declareGoodsLogisticsWarehouseName;
 
-    @ExcelProperty(value = "报货类型", order = 32)
+    @ExcelProperty(value = "报货类型", order = 35)
     @ColumnWidth(20)
     private String declareGoodsType;
 
-    @ExcelProperty(value = "云流水报货时间", order = 33)
+    @ExcelProperty(value = "云流水报货时间", order = 36)
     @ColumnWidth(35)
     private String ylsDeclareGoodsTime;
 
-    @ExcelProperty(value = "仓库配送时间", order = 34)
+    @ExcelProperty(value = "仓库配送时间", order = 37)
     @ColumnWidth(35)
     private String warehouseDeliveryTime;
 
-    @ExcelProperty(value = "收款公司", order = 35)
+    @ExcelProperty(value = "收款公司", order = 38)
     @ColumnWidth(35)
     private String receivingFirmName;
 
-    @ExcelProperty(value = "收款公司民生银行账号", order = 36)
+    @ExcelProperty(value = "收款公司民生银行账号", order = 39)
     @ColumnWidth(35)
     private String receivingMsBankAccount;
 
-    @ExcelProperty(value = "店铺地址", order = 37)
+    @ExcelProperty(value = "店铺地址", order = 40)
     @ColumnWidth(40)
     private String shopAddress;
 
-    @ExcelProperty(value = "阶段状态-建店资料收集", order = 38)
+    @ExcelProperty(value = "阶段状态-建店资料收集", order = 41)
     @ColumnWidth(30)
     private String buildInformationStatus;
 
-    @ExcelProperty(value = "建店资料完成时间", order = 39)
+    @ExcelProperty(value = "建店资料完成时间", order = 42)
     @ColumnWidth(30)
     private String buildInformationEndTime;
 }