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

无关风月

2025-04-29 3f62a93a0b0d64984cf070d0ca307a55faf95085

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

@@ -34,7 +34,7 @@
    @NotBlank
    private String content;

    @ApiModelProperty("0注册协议;1:隐私政策;2:司机操作指导")
    @ApiModelProperty("0注册协议;1:隐私政策;2:司机操作指导；3：服务规则管理")
    @TableField("content_type")
    private Integer contentType;