From 6c56f35bef519265b4e7ae98fda6ca87855daf9f Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 15 十二月 2022 11:29:08 +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 | 13 ++++++++-----
1 files changed, 8 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..9e28e1f 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
@@ -23,7 +23,7 @@
@NotBlank(message = "闂ㄥ簵鍚嶇О涓嶈兘涓虹┖")
@ApiModelProperty("闂ㄥ簵鍚嶇О")
- private String storename;
+ private String storeName;
@NotBlank(message = "鎵嬫満鍙蜂笉鑳戒负绌�")
@Pattern(regexp = "^[1][3,4,5,6,7,8,9][0-9]{9}$", message = "鎵嬫満鍙锋牸寮忔湁璇�")
@@ -31,12 +31,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 +51,9 @@
private String description;
@ApiModelProperty("鎽勫儚澶�")
- @TableField("video_id")
- private String videoId;
+ private String relationVideo;
+
+ @ApiModelProperty("搴楅摵鐘舵��")
+ @TableField("status")
+ private String status;
}
--
Gitblit v1.8.0