加盟费付款增加字段，发票回传增加字段

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

@@ -111,6 +111,9 @@ public class InvoicingDTO {
     private BigDecimal actualPaymentAmount;
 
     private String financialRemarks;
+    @Column(name = "annex")
+    @ApiModelProperty("附件")
+    private String annex;
 
 
 

coolstore-partner-model/src/main/java/com/cool/store/entity/InvoicingDO.java

@@ -112,6 +112,8 @@ public class InvoicingDO {
     private BigDecimal actualPaymentAmount;
 
     private String financialRemarks;
+    @Column(name = "annex")
+    private String annex;
 
     /**
      * @return id

coolstore-partner-model/src/main/java/com/cool/store/entity/LinePayDO.java

@@ -84,4 +84,7 @@ public class LinePayDO implements Serializable {
     private Integer payBusinessType;
     @ApiModelProperty("缴费金额")
     private BigDecimal amount;
+
+    @ApiModelProperty("组合字段：缴费时间+付款截图，数组")
+    private String combinedField;
 }

coolstore-partner-model/src/main/java/com/cool/store/request/LinePaySubmitRequest.java

@@ -57,4 +57,6 @@ public class LinePaySubmitRequest {
     private Long shopId;
     @ApiModelProperty("缴费金额")
     private BigDecimal amount;
+    @ApiModelProperty("组合字段：缴费时间+付款截图，数组")
+    private String combinedField;
 }

coolstore-partner-model/src/main/java/com/cool/store/response/FranchiseFeeResponse.java

@@ -117,6 +117,8 @@ public class FranchiseFeeResponse {
 
         @ApiModelProperty("审核状态 0通过,1拒绝")
         private Integer status;
+        @ApiModelProperty("组合字段：缴费时间+付款截图，数组")
+        private String combinedField;
 
         public static LinePay from(LinePayDO linePayDO) {
             if (linePayDO == null) {
@@ -143,6 +145,7 @@ public class FranchiseFeeResponse {
             linePayDO1.setUpdateUserId(linePayDO.getUpdateUserId());
             linePayDO1.setDeleted(linePayDO.getDeleted());
             linePayDO1.setPayBusinessType(linePayDO.getPayBusinessType());
+            linePayDO1.setCombinedField(linePayDO.getCombinedField());
             return linePayDO1;
         }
     }