Merge remote-tracking branch 'origin/master'

phpcjl

2024-12-18 3f8e43bb394301b7018a03d2d38e70e1232443d6

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/ShopCommissionStatisticsVO.java

@@ -16,25 +16,25 @@
     * 总金额
     */
    @ApiModelProperty(value = "总金额")
    private BigDecimal totalAmount;
    private BigDecimal totalAmount = BigDecimal.ZERO;

    /**
     * 分佣总金额
     */
    @ApiModelProperty(value = "分佣总金额")
    private BigDecimal totalCommission;
    private BigDecimal totalCommission = BigDecimal.ZERO;

    /**
     * 服务费总计
     */
    @ApiModelProperty(value = "服务费总计")
    private BigDecimal totalServiceCharge;
    private BigDecimal totalServiceCharge = BigDecimal.ZERO;

    /**
     * 下级门店分佣总金额
     */
    @ApiModelProperty(value = "下级门店分佣总金额")
    private BigDecimal totalSubordinateCommission;
    private BigDecimal totalSubordinateCommission = BigDecimal.ZERO;

    private IPage<ShopBalanceStatement> statementIPage;
}