Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-04 a981c07d34edd0975b9d556d97c1f851ce79974c

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

@@ -154,14 +154,6 @@
    @TableField("custom_order_number")
    private Integer customOrderNumber;

    @ApiModelProperty(value = "总评分")
    @TableField("score")
    private Integer score;

    @ApiModelProperty(value = "评分数量")
    @TableField("score_number")
    private Integer scoreNumber;

    @ApiModelProperty(value = "删除（0=否，1=是）")
    @TableField("del_flag")
    @TableLogic