Merge branch 'master' into cc_20251112_wallet

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

@@ -25,6 +25,12 @@ public class RevenueDataDTO {
     @ApiModelProperty("实收")
     private BigDecimal receivedAmt;
 
+    @ApiModelProperty("外卖实收")
+    private BigDecimal takeoutReceivedAmt;
+
+    @ApiModelProperty("堂食实收")
+    private BigDecimal dineInReceivedAmt;
+
     @ApiModelProperty("营业时间，yyyy-MM-dd")
     private String businessDate;
 

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

@@ -70,6 +70,12 @@ public class BigRegionDO {
     @Column(name = "hqt_region_name")
     private String hqtRegionName;
 
+    /**
+     * 加盟品牌
+     */
+    @Column(name = "join_brand")
+    private Integer joinBrand;
+
     public String getHqtRegionName() {
         return hqtRegionName;
     }

coolstore-partner-model/src/main/java/com/cool/store/vo/desk/PreparationCommonPendingVO.java

@@ -56,4 +56,7 @@ public class PreparationCommonPendingVO {
 
     @ApiModelProperty("签约人2姓名")
     private String partnershipSignatorySecond;
+
+    @ApiModelProperty("加盟品牌")
+    private String franchiseBrand;
 }

coolstore-partner-model/src/main/java/com/cool/store/vo/recipe/RevenueDataVO.java

@@ -34,5 +34,11 @@ public class RevenueDataVO {
     @ApiModelProperty("菜品列表")
     private List<LaunchDataVO> otherRecipeLaunchDates;
 
+    @ApiModelProperty("外卖实收")
+    private BigDecimal takeoutReceivedAmt;
+
+    @ApiModelProperty("堂食实收")
+    private BigDecimal dineInReceivedAmt;
+
 
 }