Merge branch 'master' into cc_20250106_v2.4

# Conflicts:
#	coolstore-partner-dao/src/main/resources/mapper/ShopStageInfoMapper.xml

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

@@ -108,6 +108,10 @@ public class InvoicingDTO {
     @ApiModelProperty("设计服务费税")
     private BigDecimal designServiceFeeTax;
 
+    private BigDecimal actualPaymentAmount;
+
+    private String financialRemarks;
+
 
 
 }

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

@@ -1,10 +1,13 @@
 package com.cool.store.entity;
 
+import lombok.Data;
+
 import java.math.BigDecimal;
 import java.util.Date;
 import javax.persistence.*;
 
 @Table(name = "xfsg_invoicing")
+@Data
 public class InvoicingDO {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -106,6 +109,10 @@ public class InvoicingDO {
     @Column(name = "update_user_id")
     private String updateUserId;
 
+    private BigDecimal actualPaymentAmount;
+
+    private String financialRemarks;
+
     /**
      * @return id
      */