From 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 09 六月 2025 11:54:00 +0800
Subject: [PATCH] 6.9新增登录失败冻结逻辑

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCvtBusinessVO.java |   88 ++++++++++++++++++++-----------------------
 1 files changed, 41 insertions(+), 47 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCvtBusinessVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCvtBusinessVO.java
index 9c73b24..8870316 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCvtBusinessVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCvtBusinessVO.java
@@ -1,14 +1,17 @@
 package com.panzhihua.common.model.vos.community;
 
-import com.panzhihua.common.validated.AddGroup;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
+
+import javax.validation.constraints.NotBlank;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.panzhihua.common.validated.AddGroup;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
  * @description: 便民服务 商家信息
@@ -19,49 +22,40 @@
 @ApiModel("商家信息")
 public class ComCvtBusinessVO implements Serializable {
 
-    @ApiModelProperty("商家ID")
-    private Long id;
-
-    @ApiModelProperty("商家名称")
-    @NotBlank(groups = {AddGroup.class},message = "商家名称不能为空")
-    private String name;
-
-    @ApiModelProperty("联系人")
-    @NotBlank(groups = {AddGroup.class},message = "联系人不能为空")
-    private String contacts;
-
-    @ApiModelProperty("联系方式")
-    @NotBlank(groups = {AddGroup.class},message = "联系方式不能为空")
-    private String contactsPhone;
-
-    @ApiModelProperty("详细地址")
-    @NotBlank(groups = {AddGroup.class},message = "详细地址不能为空")
-    private String address;
-
-    @ApiModelProperty("主营业务")
-    @NotBlank(groups = {AddGroup.class},message = "主营业务不能为空")
-    private String busScope;
-
-    @ApiModelProperty("服务范围标记:1-全攀枝花市,2-部分地区")
-    @NotBlank(groups = {AddGroup.class},message = "主营业务不能为空")
-    private Integer areaFlag;
-
-    @ApiModelProperty("商家logo")
-    @NotBlank(groups = {AddGroup.class},message = "商家logo不能为空")
-    private String logo;
-
-    @ApiModelProperty("创建人")
-    private String createBy;
-
-    @ApiModelProperty("创建时间")
-    private Date createAt;
-
-    @ApiModelProperty(value = "社区主键",hidden = true)
-    private Long communityId;
-
     @ApiModelProperty("服务范围集合")
     List<ComActVO> comActVOS;
-
+    @ApiModelProperty("商家ID")
+    private Long id;
+    @ApiModelProperty("商家名称")
+    @NotBlank(groups = {AddGroup.class}, message = "商家名称不能为空")
+    private String name;
+    @ApiModelProperty("联系人")
+    @NotBlank(groups = {AddGroup.class}, message = "联系人不能为空")
+    private String contacts;
+    @ApiModelProperty("联系方式")
+    @NotBlank(groups = {AddGroup.class}, message = "联系方式不能为空")
+    private String contactsPhone;
+    @ApiModelProperty("详细地址")
+    @NotBlank(groups = {AddGroup.class}, message = "详细地址不能为空")
+    private String address;
+    @ApiModelProperty("主营业务")
+    @NotBlank(groups = {AddGroup.class}, message = "主营业务不能为空")
+    private String busScope;
+    @ApiModelProperty("服务范围标记:1-全攀枝花市,2-部分地区")
+    @NotBlank(groups = {AddGroup.class}, message = "主营业务不能为空")
+    private Integer areaFlag;
+    @ApiModelProperty("商家logo")
+    @NotBlank(groups = {AddGroup.class}, message = "商家logo不能为空")
+    private String logo;
+    @ApiModelProperty("创建人")
+    private String createBy;
+    @ApiModelProperty("创建人名称")
+    private String createByName;
+    @ApiModelProperty("创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createAt;
+    @ApiModelProperty(value = "社区主键", hidden = true)
+    private Long communityId;
     @ApiModelProperty("商家介绍媒体文件类型:1-图片 2-视频")
     private Integer mediaType;
 

--
Gitblit v1.7.1