From d90ac211d9168c1ce8d390838f367a0db00afb52 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 03 六月 2025 14:37:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Agreement.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Agreement.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Agreement.java
index 124521d..b791aeb 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Agreement.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Agreement.java
@@ -10,6 +10,8 @@
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * <p>
  * 协议政策、司机操作指导
@@ -29,9 +31,10 @@
 
     @ApiModelProperty("内容")
     @TableField("content")
+    @NotBlank
     private String content;
 
-    @ApiModelProperty("0注册协议;1:隐私政策;2:司机操作指导")
+    @ApiModelProperty("0注册协议;1:隐私政策;2:司机操作指导;3:服务规则管理")
     @TableField("content_type")
     private Integer contentType;
 

--
Gitblit v1.7.1