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

无关风月

5 天以前 7e92d9c7f76777c48f76376c99ffaae2e16fe7ed

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

@@ -30,7 +30,7 @@
    @TableField("content")
    private String content;

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