Merge remote-tracking branch 'origin/dev' into dev

无关风月

9 天以前 f135f2c8c08b16ac25a4e8e0398418ab3ce1e620

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

@@ -32,7 +32,7 @@
    private String title;

    @ApiModelProperty("描述")
    @TableField("describe")
    private String describe;
    @TableField("describe_detail")
    private String describeDetail;

}