Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-25 4c1a7c9a3ca949ce878d9f5683fdafce4acbe635

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

@@ -22,7 +22,7 @@
    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "主键")
    @TableId(value = "id", type = IdType.AUTO)
    @TableId("id")
    private Integer id;

    @ApiModelProperty(value = "用户id")