Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-26 e828950f531e5a2426ce07f5cfed3c206e7728db

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java

@@ -98,9 +98,9 @@
    @TableField("shop_all_point")
    private Integer shopAllPoint;

    @ApiModelProperty(value = "门店业绩积分")
    @TableField("shop_point")
    private Integer shopPoint;
    @ApiModelProperty(value = "绑定下级门店分佣积分")
    @TableField("lower_level_share_point")
    private Integer lowerLevelSharePoint;

    @ApiModelProperty(value = "门店返佣积分")
    @TableField("share_point")