Merge remote-tracking branch 'origin/master'

luodangjia

2024-11-05 4dd69a0476fc2b9e1cff291611d7e56fbe4324ec

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

@@ -36,7 +36,7 @@
    private String detail;

    @ApiModelProperty("排序权重")
    @TableField("order")
    private Integer order;
    @TableField("sort")
    private Integer sort;

}