Merge remote-tracking branch 'origin/master'

luodangjia

2024-11-06 d6ef18f23c4b298cb9b977ab3a5d65e2f4a39fe2

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Site.java

@@ -26,6 +26,9 @@

    @TableId(value = "id",type = IdType.AUTO)
    private Integer id;
    @ApiModelProperty("排序")
    @TableField("sort")
    private Integer sort;

    @ApiModelProperty("站点名称")
    @TableField("site_name")