Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-19 60f70f7409ec1ece8905e088fb43e0cb0258a70b

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

@@ -110,10 +110,6 @@
    @TableField("server_point")
    private Integer serverPoint;

    @ApiModelProperty(value = "下级门店返佣积分")
    @TableField("lower_level_rebate_points")
    private Integer lowerLevelRebatePoints;

    @ApiModelProperty(value = "门店已用积分")
    @TableField("use_point")
    private Integer usePoint;