From 10cc0db30a1be5377e4c09bce349014a667849b6 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期三, 12 一月 2022 13:21:08 +0800
Subject: [PATCH] Merge branch 'phs' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/McsMerchantDTO.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/McsMerchantDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/McsMerchantDTO.java
index 9c683c2..4fa8b64 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/McsMerchantDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/McsMerchantDTO.java
@@ -39,6 +39,7 @@
     private Integer level;
 
     @ApiModelProperty("点亮天数")
+    @NotNull(groups = {AddGroup.class}, message = "点亮天数不能为空")
     private Integer litDays;
 
     @ApiModelProperty("商家账号")
@@ -78,4 +79,10 @@
 
     @ApiModelProperty(value = "更新人", hidden = true)
     private Long updatedBy;
+
+    @ApiModelProperty(value = "所属商家", hidden = true)
+    private Long userId;
+
+    @ApiModelProperty(value = "用户头像", hidden = true)
+    private String imageUrl;
 }
\ No newline at end of file

--
Gitblit v1.7.1