From 6fb14149d62199cfcc0448c82eb2f51f9c5181de Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Thu, 31 Dec 2020 16:55:30 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into parter
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/BusinessRecords.java | 90 ++++++++++++++++++++++----------------------
1 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/BusinessRecords.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/BusinessRecords.java
index 65d83c4..71bd2aa 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/BusinessRecords.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/BusinessRecords.java
@@ -1,20 +1,24 @@
package com.kidgrow.oprationcenter.model;
+import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.kidgrow.common.model.SuperModel;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
-import org.hibernate.validator.constraints.NotBlank;
+import org.hibernate.validator.constraints.NotEmpty;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @version 1.0
* @Description: 业务操作记录<br>
* @Project: 用户中心<br>
* @CreateDate: Created in 2020-04-01 09:37:05 <br>
* @Author: <a href="4345453@kidgrow.com">liuke</a>
- * @version 1.0
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -22,47 +26,43 @@
@AllArgsConstructor
@TableName("business_records")
public class BusinessRecords extends SuperModel {
- private static final long serialVersionUID=1L;
+ private static final long serialVersionUID = 1L;
- /**
- * 记录标题
- */
- @NotBlank(message = "记录标题不能为空")
- private String recordTitle;
- /**
- * 操作人ID
- */
- @NotBlank(message = "操作人ID不能为空")
- private Long userId;
- /**
- * 操作人姓名
- */
- @NotBlank(message = "操作人姓名不能为空")
- private String userName;
- /**
- * 应用ID
- */
- @NotBlank(message = "应用ID不能为空")
- private Long appId;
- /**
- * 应用名称
- */
- @NotBlank(message = "应用名称不能为空")
- private String appName;
- /**
- * ip
- */
- private String recordIp;
- /**
- * 业务操作记录详情
- */
- private String recordDetail;
- /**
- * 是否删除，1删除，0未删除
- */
- private Boolean isDel;
- /**
- * 状态，1启用，0停用
- */
- private Boolean enabled;
- }
+ /**
+ * 记录标题
+ */
+ @NotEmpty(message = "记录标题不能为空")
+ private String recordTitle;
+ /**
+ * 操作人ID
+ */
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long userId;
+ /**
+ * 操作人姓名
+ */
+ @NotEmpty(message = "操作人姓名不能为空")
+ private String userName;
+ /**
+ * 应用名称
+ */
+ @NotEmpty(message = "应用名称不能为空")
+ private String appName;
+ /**
+ * ip
+ */
+ private String recordIp;
+ /**
+ * 业务操作记录详情
+ */
+ private String recordDetail;
+ /**
+ * 是否删除，1删除，0未删除
+ */
+ @TableLogic
+ private Boolean isDel;
+ /**
+ * 状态，1启用，0停用
+ */
+ private Boolean enabled;
+}
--
Gitblit v1.8.0