From a4cd4c2d98392cd1036f36b96c262878743a7e63 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 05 九月 2024 19:52:22 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

---
 ycl-platform/src/main/java/com/ycl/dto/store/UmsStoreInfoParam.java |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/dto/store/UmsStoreInfoParam.java b/ycl-platform/src/main/java/com/ycl/dto/store/UmsStoreInfoParam.java
index 3279496..b4783b8 100644
--- a/ycl-platform/src/main/java/com/ycl/dto/store/UmsStoreInfoParam.java
+++ b/ycl-platform/src/main/java/com/ycl/dto/store/UmsStoreInfoParam.java
@@ -6,6 +6,7 @@
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Pattern;
@@ -19,11 +20,13 @@
 
     @NotBlank(message = "闂ㄥ簵鎵�鏈変汉涓嶈兘涓虹┖")
     @ApiModelProperty("濮撳悕")
+    @Length(min = 2,max = 10)
     private String owner;
 
     @NotBlank(message = "闂ㄥ簵鍚嶇О涓嶈兘涓虹┖")
     @ApiModelProperty("闂ㄥ簵鍚嶇О")
-    private String storename;
+    @Length(min = 2,max = 20)
+    private String storeName;
 
     @NotBlank(message = "鎵嬫満鍙蜂笉鑳戒负绌�")
     @Pattern(regexp = "^[1][3,4,5,6,7,8,9][0-9]{9}$", message = "鎵嬫満鍙锋牸寮忔湁璇�")
@@ -31,12 +34,12 @@
     private String contact;
 
     @ApiModelProperty("鍦板潃")
-    private String storeaddr;
+    private String storeAddress;
 
     @ApiModelProperty("鐓х墖")
     private String storephoto;
 
-    @NotBlank(message = "韬唤璇佷俊鎭笉鑳戒负绌�")
+//    @NotBlank(message = "韬唤璇佷俊鎭笉鑳戒负绌�")
     @ApiModelProperty("韬唤璇佷俊鎭�")
     private String idcardinfo;
 
@@ -51,6 +54,9 @@
     private String description;
 
     @ApiModelProperty("鎽勫儚澶�")
-    @TableField("video_id")
-    private String videoId;
+    private Long relationVideo;
+
+    @ApiModelProperty("搴楅摵鐘舵��")
+    @TableField("status")
+    private Integer status;
 }

--
Gitblit v1.8.0